You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/07/23 12:06:07 UTC
[incubator-nuttx] branch master updated: drivers/lcd: Fix the
memory leak when board_graphics_setup fail
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 131535d drivers/lcd: Fix the memory leak when board_graphics_setup fail
131535d is described below
commit 131535dfe4dd32d826b3a433500b3fe5cb0281f9
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Jul 23 02:40:29 2020 +0800
drivers/lcd: Fix the memory leak when board_graphics_setup fail
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I08a7ecc48b2c28b1c8c97f74e7a163ca67de6fca
---
drivers/lcd/lcd_framebuffer.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/lcd/lcd_framebuffer.c b/drivers/lcd/lcd_framebuffer.c
index 90d4d6f..fc00ff9 100644
--- a/drivers/lcd/lcd_framebuffer.c
+++ b/drivers/lcd/lcd_framebuffer.c
@@ -198,7 +198,7 @@ static int lcdfb_update(FAR struct lcdfb_dev_s *priv,
endx = rect->pt2.x;
if (endx >= priv->xres)
{
- endx = priv->xres-1;
+ endx = priv->xres - 1;
}
starty = rect->pt1.y;
@@ -210,7 +210,7 @@ static int lcdfb_update(FAR struct lcdfb_dev_s *priv,
endy = rect->pt2.y;
if (endy >= priv->yres)
{
- endy = priv->yres-1;
+ endy = priv->yres - 1;
}
/* If the display uses a value of BPP < 8, then we may have to extend the
@@ -330,7 +330,7 @@ static int lcdfb_getcmap(FAR struct fb_vtable_s *vtable,
if (priv != NULL && cmap != NULL)
{
- /* Get the video info from the contained LCD */
+ /* Get the color map from the contained LCD */
lcd = priv->lcd
DEBUGASSERT(lcd->getcmap != NULL);
@@ -364,7 +364,7 @@ static int lcdfb_putcmap(FAR struct fb_vtable_s *vtable,
if (priv != NULL && cmap != NULL)
{
- /* Get the video info from the contained LCD */
+ /* Set the color map to the contained LCD */
lcd = priv->lcd
DEBUGASSERT(lcd->putcmap != NULL);
@@ -399,7 +399,7 @@ static int lcdfb_getcursor(FAR struct fb_vtable_s *vtable,
if (priv != NULL && attrib != NULL)
{
- /* Get the video info from the contained LCD */
+ /* Get the cursor info from the contained LCD */
lcd = priv->lcd
DEBUGASSERT(lcd->getcursor != NULL);
@@ -433,7 +433,7 @@ static int lcdfb_setcursor(FAR struct fb_vtable_s *vtable,
if (priv != NULL && settings != NULL)
{
- /* Get the video info from the contained LCD */
+ /* Set the cursor info to the contained LCD */
lcd = priv->lcd
DEBUGASSERT(lcd->setcursor != NULL);
@@ -510,7 +510,8 @@ int up_fbinitialize(int display)
if (lcd == NULL)
{
gerr("ERROR: board_graphics_setup failed, devno=%d\n", display);
- return EXIT_FAILURE;
+ ret = -ENODEV;
+ goto errout_with_state;
}
#else
/* Initialize the LCD device */
@@ -589,15 +590,15 @@ int up_fbinitialize(int display)
/* Turn the LCD on at 75% power */
- priv->lcd->setpower(priv->lcd, ((3*CONFIG_LCD_MAXPOWER + 3)/4));
+ priv->lcd->setpower(priv->lcd, ((3*CONFIG_LCD_MAXPOWER + 3) / 4));
return OK;
errout_with_lcd:
#ifndef CONFIG_LCD_EXTERNINIT
board_lcd_uninitialize();
+#endif
errout_with_state:
-#endif
kmm_free(priv);
return ret;
}
@@ -607,7 +608,8 @@ errout_with_state:
*
* Description:
* Return a a reference to the framebuffer object for the specified video
- * plane of the specified plane. Many OSDs support multiple planes of video.
+ * plane of the specified plane. Many OSDs support multiple planes of
+ * video.
*
* Input Parameters:
* display - In the case of hardware with multiple displays, this