diff options
| author | Jean Pihet <jean.pihet@newoldbits.com> | 2012-09-24 16:16:40 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-10-02 23:55:31 +0200 |
| commit | ce3810cdb4ca31238c87e095d2c494a5eaa4f65d (patch) | |
| tree | 06e6c3e474456473c50d469cddd05e600de9a795 /drivers/power/avs/smartreflex.c | |
| parent | ARM: OMAP: SmartReflex: select CONFIG_POWER_SUPPLY in Kconfig (diff) | |
| download | linux-ce3810cdb4ca31238c87e095d2c494a5eaa4f65d.tar.xz linux-ce3810cdb4ca31238c87e095d2c494a5eaa4f65d.zip | |
ARM: OMAP: SmartReflex: fix error path in init function
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>
Diffstat (limited to 'drivers/power/avs/smartreflex.c')
| -rw-r--r-- | 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 44efc6e202af..92f67283c965 100644 --- a/drivers/power/avs/smartreflex.c +++ b/drivers/power/avs/smartreflex.c @@ -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: |