summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/ab8500-core.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-02-20 21:42:03 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-03-06 18:46:41 +0100
commit6d95b7fdd0bd2e28ef651da6863d75edca4c2aca (patch)
tree5724786829825e0a856fb44e587214061f836a32 /drivers/mfd/ab8500-core.c
parentd2cb87c23e8514ca49c85adc5924999927bb9494 (diff)
downloadop-kernel-dev-6d95b7fdd0bd2e28ef651da6863d75edca4c2aca.zip
op-kernel-dev-6d95b7fdd0bd2e28ef651da6863d75edca4c2aca.tar.gz
mfd: Fix ab8500 error path bug
We were not freeing the irq properly in the error path in the AB8500 driver. Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Maxime Coquelin <maxime.coquelin@stericsson.com> Signed-off-by: Alex Macro <alex.macro@stericsson.com> Signed-off-by: Michel Jaouen <michel.jaouen@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/ab8500-core.c')
-rw-r--r--drivers/mfd/ab8500-core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 53e2a80..d295941 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -956,11 +956,12 @@ int __devinit ab8500_init(struct ab8500 *ab8500)
return ret;
out_freeirq:
- if (ab8500->irq_base) {
+ if (ab8500->irq_base)
free_irq(ab8500->irq, ab8500);
out_removeirq:
+ if (ab8500->irq_base)
ab8500_irq_remove(ab8500);
- }
+
return ret;
}
OpenPOWER on IntegriCloud