[PATCH] video/edid: Fix edid_to_display_timings error path

[PATCH] video/edid: Fix edid_to_display_timings error path

[Philipp Zabel]

edid_to_display_timings is called in drivers/video/imx-ipu-v3/imx-hdmi.c,
drivers/video/simple-panel.c, and drivers/video/edid.c with the struct
display_timings *timings parameter pointing to an embedded struct
display_timings inside a struct fb_info. The timings pointer is not to
be freed in the error path.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/video/edid.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/video/edid.c b/drivers/video/edid.c
index 92b59a5..2585264 100644
--- a/drivers/video/edid.c
+++ b/drivers/video/edid.c
@@ -792,7 +792,6 @@ int edid_to_display_timings(struct display_timings *timings, unsigned char *edid
 
 	return 0;
 out:
-	free(timings);
 	free(mode);
 	return ret;
 }
-- 
2.8.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] video/edid: Fix edid_to_display_timings error path

[Sascha Hauer]

On Thu, Sep 01, 2016 at 11:28:39AM +0200, Philipp Zabel wrote:
> edid_to_display_timings is called in drivers/video/imx-ipu-v3/imx-hdmi.c,
> drivers/video/simple-panel.c, and drivers/video/edid.c with the struct
> display_timings *timings parameter pointing to an embedded struct
> display_timings inside a struct fb_info. The timings pointer is not to
> be freed in the error path.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  drivers/video/edid.c | 1 -
>  1 file changed, 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/video/edid.c b/drivers/video/edid.c
> index 92b59a5..2585264 100644
> --- a/drivers/video/edid.c
> +++ b/drivers/video/edid.c
> @@ -792,7 +792,6 @@ int edid_to_display_timings(struct display_timings *timings, unsigned char *edid
>  
>  	return 0;
>  out:
> -	free(timings);
>  	free(mode);
>  	return ret;
>  }
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox