From c9c1b16dc7ce2efa7d34564b37f797168333b121 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 26 Aug 2012 13:58:20 -0700
Subject: [PATCH] --- yaml --- r: 324409 b: refs/heads/master c:
 80732cc1026af128e89f43aa60ddf2220e8169e8 h: refs/heads/master i:   324407:
 42371980aaed060b7239465cb87a75bf6874896a v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/extcon/extcon-arizona.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f9e628f7ac2b..28ae4f857c02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a500e0e73514ee2b838e439d3eb0750dda1da20f
+refs/heads/master: 80732cc1026af128e89f43aa60ddf2220e8169e8
diff --git a/trunk/drivers/extcon/extcon-arizona.c b/trunk/drivers/extcon/extcon-arizona.c
index fa2114f1f9ec..13eafcbbd3f8 100644
--- a/trunk/drivers/extcon/extcon-arizona.c
+++ b/trunk/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: