From 105f2ac4735a7400d3b0cd7398ce09da301ff9e1 Mon Sep 17 00:00:00 2001 From: Jean Pihet Date: Mon, 24 Sep 2012 16:16:40 +0200 Subject: [PATCH] --- yaml --- r: 333341 b: refs/heads/master c: ce3810cdb4ca31238c87e095d2c494a5eaa4f65d h: refs/heads/master i: 333339: 65ea6318acdacb0a655418ca00494db00f2bc3e6 v: v3 --- [refs] | 2 +- trunk/drivers/power/avs/smartreflex.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 68ad24f2ec72..8ade54b25f2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70071ff989bae3edfc14847aaa8e1c3baa2aacff +refs/heads/master: ce3810cdb4ca31238c87e095d2c494a5eaa4f65d diff --git a/trunk/drivers/power/avs/smartreflex.c b/trunk/drivers/power/avs/smartreflex.c index 44efc6e202af..92f67283c965 100644 --- a/trunk/drivers/power/avs/smartreflex.c +++ b/trunk/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: