summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-26 22:58:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-05 21:18:11 +0200
commit80732cc1026af128e89f43aa60ddf2220e8169e8 (patch)
treebbf7cdc71a1b2110d2cd59ca59826e0a2524fd94
parentDrivers: hv: kvp: Copy the address family information (diff)
downloadlinux-80732cc1026af128e89f43aa60ddf2220e8169e8.tar.xz
linux-80732cc1026af128e89f43aa60ddf2220e8169e8.zip
extcon: arizona: Free MICDET IRQ on error during probe
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/extcon/extcon-arizona.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index fa2114f1f9ec..13eafcbbd3f8 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -488,11 +488,13 @@ static int __devinit arizona_extcon_probe(struct platform_device *pdev)
ret = input_register_device(info->input);
if (ret) {
dev_err(&pdev->dev, "Can't register input device: %d\n", ret);
- goto err_fall_wake;
+ goto err_micdet;
}
return 0;
+err_micdet:
+ arizona_free_irq(arizona, ARIZONA_IRQ_MICDET, info);
err_fall_wake:
arizona_set_irq_wake(arizona, ARIZONA_IRQ_JD_FALL, 0);
err_fall: