---

yaml --- r: 324409 b: refs/heads/master c: 80732cc h: refs/heads/master i: 324407: 4237198 v: v3
git-mirror · Sep 5, 2012 · c9c1b16 · c9c1b16
1 parent e1db781
commit c9c1b16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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: