[PATCH] ARM: OMAP: SmartReflex: fix error path in init function

[PATCH] ARM: OMAP: SmartReflex: fix error path in init function

[jean.pihet]

From: Jean Pihet <j-pihet@ti.com>

Fix the error handling path in omap_sr_probe to correctly
de-allocate resources in case of problems.

Signed-off-by: Jean Pihet <j-pihet@ti.com>
---
 drivers/power/avs/smartreflex.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
index 734493d..a802f4c 100644
--- a/drivers/power/avs/smartreflex.c
+++ b/drivers/power/avs/smartreflex.c
@@ -911,7 +911,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 	if (!sr_info->base) {
 		dev_err(&pdev->dev, "%s: ioremap fail\n", __func__);
 		ret = -ENOMEM;
-		goto err_release_region;
+		goto err_free_name;
 	}
 
 	if (irq)
@@ -949,7 +949,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "%s: Unable to create debugfs directory\n",
 			__func__);
 		ret = PTR_ERR(sr_info->dbg_dir);
-		goto err_free_name;
+		goto err_debugfs;
 	}
 
 	(void) debugfs_create_file("autocomp", S_IRUGO | S_IWUSR,
@@ -993,11 +993,11 @@ static int __init omap_sr_probe(struct platform_device *pdev)
 
 err_debugfs:
 	debugfs_remove_recursive(sr_info->dbg_dir);
-err_free_name:
-	kfree(sr_info->name);
 err_iounmap:
 	list_del(&sr_info->node);
 	iounmap(sr_info->base);
+err_free_name:
+	kfree(sr_info->name);
 err_release_region:
 	release_mem_region(mem->start, resource_size(mem));
 err_free_devinfo:
-- 
1.7.7.6

Re: [PATCH] ARM: OMAP: SmartReflex: fix error path in init function

[Jean Pihet]

Hi!

On Fri, Sep 14, 2012 at 12:14 PM,  <jean.pihet@newoldbits.com> wrote:
> From: Jean Pihet <j-pihet@ti.com>
>
> Fix the error handling path in omap_sr_probe to correctly
> de-allocate resources in case of problems.

Please note that this patch applies on top of 'ARM: OMAP: SmartReflex:
pass device dependent data via platform data' [1].

[1] http://marc.info/?l=linux-omap&m=134761557609931&w=2

Regards,
Jean

>
> Signed-off-by: Jean Pihet <j-pihet@ti.com>
> ---
>  drivers/power/avs/smartreflex.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
> index 734493d..a802f4c 100644
> --- a/drivers/power/avs/smartreflex.c
> +++ b/drivers/power/avs/smartreflex.c
> @@ -911,7 +911,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
>         if (!sr_info->base) {
>                 dev_err(&pdev->dev, "%s: ioremap fail\n", __func__);
>                 ret = -ENOMEM;
> -               goto err_release_region;
> +               goto err_free_name;
>         }
>
>         if (irq)
> @@ -949,7 +949,7 @@ static int __init omap_sr_probe(struct platform_device *pdev)
>                 dev_err(&pdev->dev, "%s: Unable to create debugfs directory\n",
>                         __func__);
>                 ret = PTR_ERR(sr_info->dbg_dir);
> -               goto err_free_name;
> +               goto err_debugfs;
>         }
>
>         (void) debugfs_create_file("autocomp", S_IRUGO | S_IWUSR,
> @@ -993,11 +993,11 @@ static int __init omap_sr_probe(struct platform_device *pdev)
>
>  err_debugfs:
>         debugfs_remove_recursive(sr_info->dbg_dir);
> -err_free_name:
> -       kfree(sr_info->name);
>  err_iounmap:
>         list_del(&sr_info->node);
>         iounmap(sr_info->base);
> +err_free_name:
> +       kfree(sr_info->name);
>  err_release_region:
>         release_mem_region(mem->start, resource_size(mem));
>  err_free_devinfo:
> --
> 1.7.7.6
>