From 30a355221c36a25bd95f79eaee402cf95a3eaa35 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 20 Feb 2012 21:42:03 +0100
Subject: [PATCH] --- yaml --- r: 288166 b: refs/heads/master c:
 a60e8df64ddc6bd79c85a970f59f2967c968cfac h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/ab8500-core.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index af77201a4b12..1826344dafb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7c248a049c2aac21bded0b0722caee6f0e57256
+refs/heads/master: a60e8df64ddc6bd79c85a970f59f2967c968cfac
diff --git a/trunk/drivers/mfd/ab8500-core.c b/trunk/drivers/mfd/ab8500-core.c
index 53e2a80f42fa..d295941c9a3d 100644
--- a/trunk/drivers/mfd/ab8500-core.c
+++ b/trunk/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;
 }