From: Axel Lin <axel.lin@ingics.com>
To: linux-kernel@vger.kernel.org
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>
Subject: [PATCH] extcon: max77693: Fix max77693_muic_probe error handling
Date: Wed, 03 Oct 2012 10:23:58 +0800 [thread overview]
Message-ID: <1349231038.6191.1.camel@phoenix> (raw)
Fix below issues:
1. If request_threaded_irq() fails, current code does not free all requested
irqs.
2. Add missing extcon_dev_unregister() in error path if failed to read revision
number.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/extcon/extcon-max77693.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index e0ed622..9928c63 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -696,12 +696,8 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
IRQF_ONESHOT, muic_irq->name, info);
if (ret) {
dev_err(&pdev->dev,
- "failed: irq request (IRQ: %d,"
- " error :%d)\n",
+ "failed: irq request (IRQ: %d, error :%d)\n",
muic_irq->irq, ret);
-
- for (i = i - 1; i >= 0; i--)
- free_irq(muic_irq->virq, info);
goto err_irq;
}
}
@@ -726,7 +722,7 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
MAX77693_MUIC_REG_ID, &id);
if (ret < 0) {
dev_err(&pdev->dev, "failed to read revision number\n");
- goto err_extcon;
+ goto err_read_reg;
}
dev_info(info->dev, "device ID : 0x%x\n", id);
@@ -738,9 +734,13 @@ static int __devinit max77693_muic_probe(struct platform_device *pdev)
return ret;
+err_read_reg:
+ extcon_dev_unregister(info->edev);
err_extcon:
kfree(info->edev);
err_irq:
+ while (--i >= 0)
+ free_irq(muic_irqs[i].virq, info);
err_regmap:
kfree(info);
err_kfree:
--
1.7.9.5
next reply other threads:[~2012-10-03 2:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-03 2:23 Axel Lin [this message]
2012-10-04 1:27 ` [PATCH] extcon: max77693: Fix max77693_muic_probe error handling Chanwoo Choi
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=1349231038.6191.1.camel@phoenix \
--to=axel.lin@ingics.com \
--cc=cw00.choi@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
/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