]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
ARM: OMAP: SmartReflex: fix error path in init function
authorJean Pihet <jean.pihet@newoldbits.com>
Mon, 24 Sep 2012 14:16:40 +0000 (16:16 +0200)
committerKevin Hilman <khilman@ti.com>
Tue, 2 Oct 2012 21:55:31 +0000 (14:55 -0700)
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>
Signed-off-by: Kevin Hilman <khilman@ti.com>
drivers/power/avs/smartreflex.c

index 44efc6e202afdfeb2f9cd98d6305cb517ad78dd8..92f67283c9654dffba201649ced9d99a91c622d3 100644 (file)
@@ -928,7 +928,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)
@@ -967,7 +967,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,
@@ -1011,11 +1011,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: