diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-26 16:58:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-05 15:18:11 -0400 |
commit | 80732cc1026af128e89f43aa60ddf2220e8169e8 (patch) | |
tree | bbf7cdc71a1b2110d2cd59ca59826e0a2524fd94 /drivers/extcon | |
parent | a500e0e73514ee2b838e439d3eb0750dda1da20f (diff) |
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>
Diffstat (limited to 'drivers/extcon')
-rw-r--r-- | drivers/extcon/extcon-arizona.c | 4 |
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) | |||
488 | ret = input_register_device(info->input); | 488 | ret = input_register_device(info->input); |
489 | if (ret) { | 489 | if (ret) { |
490 | dev_err(&pdev->dev, "Can't register input device: %d\n", ret); | 490 | dev_err(&pdev->dev, "Can't register input device: %d\n", ret); |
491 | goto err_fall_wake; | 491 | goto err_micdet; |
492 | } | 492 | } |
493 | 493 | ||
494 | return 0; | 494 | return 0; |
495 | 495 | ||
496 | err_micdet: | ||
497 | arizona_free_irq(arizona, ARIZONA_IRQ_MICDET, info); | ||
496 | err_fall_wake: | 498 | err_fall_wake: |
497 | arizona_set_irq_wake(arizona, ARIZONA_IRQ_JD_FALL, 0); | 499 | arizona_set_irq_wake(arizona, ARIZONA_IRQ_JD_FALL, 0); |
498 | err_fall: | 500 | err_fall: |