| Message ID | 1344008414-2894-5-git-send-email-damien.cassou@lifl.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Aug 03, 2012 at 05:40:13PM +0200, Damien Cassou wrote: > @@ -233,7 +234,6 @@ static int mddi_nt35399_remove(struct platform_device *pdev) > struct panel_info *panel = platform_get_drvdata(pdev); > > setup_vsync(panel, 0); > - kfree(panel); > return 0; > } > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in It's weird. This patch doesn't apply for me unless I add a blank line between the "}" and the "--". I'm not sure if that line is getting removed by your email client or by the kernel janitors email list. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Aug 03, 2012 at 05:40:13PM +0200, Damien Cassou wrote: > From: Damien Cassou <damien.cassou@lifl.fr> > > The various devm_ functions allocate memory that is released when a driver > detaches. This patch replaces the use of kzalloc by devm_kzalloc. > > Additionally, this patch fixes a memory leak: some memory was allocated for > 'panel' but not released when the subsequent call to setup_vsync fails. > > Signed-off-by: Damien Cassou <damien.cassou@lifl.fr> Acked-by: David Brown <davidb@codeaurora.org>
On 08/03/2012 03:40 PM, Damien Cassou wrote: > From: Damien Cassou <damien.cassou@lifl.fr> > > The various devm_ functions allocate memory that is released when a driver > detaches. This patch replaces the use of kzalloc by devm_kzalloc. > > Additionally, this patch fixes a memory leak: some memory was allocated for > 'panel' but not released when the subsequent call to setup_vsync fails. > > Signed-off-by: Damien Cassou <damien.cassou@lifl.fr> Applied. Thanks, Florian Tobias Schandinat > > --- > drivers/video/msm/mddi_client_nt35399.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c > index 7fcd67e..66b314e 100644 > --- a/drivers/video/msm/mddi_client_nt35399.c > +++ b/drivers/video/msm/mddi_client_nt35399.c > @@ -189,8 +189,9 @@ static int mddi_nt35399_probe(struct platform_device *pdev) > > int ret; > > - struct panel_info *panel = kzalloc(sizeof(struct panel_info), > - GFP_KERNEL); > + struct panel_info *panel = devm_kzalloc(&pdev->dev, > + sizeof(struct panel_info), > + GFP_KERNEL); > > printk(KERN_DEBUG "%s: enter.\n", __func__); > > @@ -233,7 +234,6 @@ static int mddi_nt35399_remove(struct platform_device *pdev) > struct panel_info *panel = platform_get_drvdata(pdev); > > setup_vsync(panel, 0); > - kfree(panel); > return 0; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c index 7fcd67e..66b314e 100644 --- a/drivers/video/msm/mddi_client_nt35399.c +++ b/drivers/video/msm/mddi_client_nt35399.c @@ -189,8 +189,9 @@ static int mddi_nt35399_probe(struct platform_device *pdev) int ret; - struct panel_info *panel = kzalloc(sizeof(struct panel_info), - GFP_KERNEL); + struct panel_info *panel = devm_kzalloc(&pdev->dev, + sizeof(struct panel_info), + GFP_KERNEL); printk(KERN_DEBUG "%s: enter.\n", __func__); @@ -233,7 +234,6 @@ static int mddi_nt35399_remove(struct platform_device *pdev) struct panel_info *panel = platform_get_drvdata(pdev); setup_vsync(panel, 0); - kfree(panel); return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in