From: jean.pihet@newoldbits.com (Jean Pihet)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] ARM: OMAP: SmartReflex: fix error path in init function
Date: Mon, 24 Sep 2012 16:16:40 +0200 [thread overview]
Message-ID: <1348496201-6378-2-git-send-email-j-pihet@ti.com> (raw)
In-Reply-To: <1348496201-6378-1-git-send-email-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 44efc6e..92f6728 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:
--
1.7.7.6
next prev parent reply other threads:[~2012-09-24 14:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 14:47 [PATCH 0/2] ARM: OMAP: SmartReflex: pass device dependent data via platform data Jean Pihet
2012-09-20 14:47 ` [PATCH 1/2] ARM: OMAP: SmartReflex: fix error path in init function Jean Pihet
2012-09-20 14:47 ` [PATCH 2/2] ARM: OMAP: SmartReflex: pass device dependent data via platform data Jean Pihet
2012-09-20 22:15 ` Tony Lindgren
2012-09-21 6:30 ` Jean Pihet
2012-09-21 19:07 ` Tony Lindgren
2012-09-24 14:10 ` Jean Pihet
2012-09-24 14:16 ` [PATCH 0/2] " Jean Pihet
2012-09-24 14:16 ` Jean Pihet [this message]
2012-10-02 21:59 ` [PATCH 1/2] ARM: OMAP: SmartReflex: fix error path in init function Kevin Hilman
2012-09-24 14:16 ` [PATCH 2/2] ARM: OMAP: SmartReflex: pass device dependent data via platform data Jean Pihet
2012-10-02 22:21 ` Kevin Hilman
2012-10-03 13:05 ` Jean Pihet
2012-10-03 13:32 ` jean.pihet at newoldbits.com
2012-10-03 14:29 ` Kevin Hilman
2012-10-03 15:51 ` Jean Pihet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348496201-6378-2-git-send-email-j-pihet@ti.com \
--to=jean.pihet@newoldbits.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).