diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-08 15:57:41 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-08 15:57:41 -0700 |
| commit | fce680e9faaa8acc0ab0a931c5fa823b581cbab0 (patch) | |
| tree | c96026ec637128c21c665a733db5594ebebbb5a4 /drivers/power/avs/smartreflex.c | |
| parent | 5e090ed7af10729a396a25df43d69a236e789736 (diff) | |
| parent | ce3810cdb4ca31238c87e095d2c494a5eaa4f65d (diff) | |
| download | olio-linux-3.10-fce680e9faaa8acc0ab0a931c5fa823b581cbab0.tar.xz olio-linux-3.10-fce680e9faaa8acc0ab0a931c5fa823b581cbab0.zip | |
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm
OMAP PM related fixes for v3.7-rc
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 d4957b4edb6..24768a27e1d 100644 --- a/drivers/power/avs/smartreflex.c +++ b/drivers/power/avs/smartreflex.c @@ -930,7 +930,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) @@ -969,7 +969,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, @@ -1013,11 +1013,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: |