2013-06-05 17:30:12

by Emil Goode

Subject: [PATCH] OMAPDSS: Remove kfree for memory allocated with devm_kzalloc

It's not necessary to free memory allocated with devm_kzalloc
in a remove function and using kfree leads to a double free.

Signed-off-by: Emil Goode <[email protected]>
---
drivers/video/omap2/displays/panel-picodlp.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/video/omap2/displays/panel-picodlp.c b/drivers/video/omap2/displays/panel-picodlp.c
index 62f2db0..859e111 100644
--- a/drivers/video/omap2/displays/panel-picodlp.c
+++ b/drivers/video/omap2/displays/panel-picodlp.c
@@ -469,8 +469,6 @@ static void picodlp_panel_remove(struct omap_dss_device *dssdev)
i2c_unregister_device(picod->picodlp_i2c_client);
dev_set_drvdata(&dssdev->dev, NULL);
dev_dbg(&dssdev->dev, "removing picodlp panel\n");
-
- kfree(picod);
}

static int picodlp_panel_enable(struct omap_dss_device *dssdev)
--
1.7.10.4

2013-06-06 07:11:19

by Archit Taneja

Subject: Re: [PATCH] OMAPDSS: Remove kfree for memory allocated with devm_kzalloc

Hi,

On Wednesday 05 June 2013 10:59 PM, Emil Goode wrote:
> It's not necessary to free memory allocated with devm_kzalloc
> in a remove function and using kfree leads to a double free.

Looks fine to me. Tomi, could you take this for 3.11?

Archit

>
> Signed-off-by: Emil Goode <[email protected]>
> ---
> drivers/video/omap2/displays/panel-picodlp.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/video/omap2/displays/panel-picodlp.c b/drivers/video/omap2/displays/panel-picodlp.c
> index 62f2db0..859e111 100644
> --- a/drivers/video/omap2/displays/panel-picodlp.c
> +++ b/drivers/video/omap2/displays/panel-picodlp.c
> @@ -469,8 +469,6 @@ static void picodlp_panel_remove(struct omap_dss_device *dssdev)
> i2c_unregister_device(picod->picodlp_i2c_client);
> dev_set_drvdata(&dssdev->dev, NULL);
> dev_dbg(&dssdev->dev, "removing picodlp panel\n");
> -
> - kfree(picod);
> }
>
> static int picodlp_panel_enable(struct omap_dss_device *dssdev)
>