From 9a955b4fdb7745ff9787053b875528e5dcdb497d 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: 296831 b: refs/heads/master c:
 6d95b7fdd0bd2e28ef651da6863d75edca4c2aca h: refs/heads/master i:   296829:
 21672e436c404d34a7077b5f8e190f0abdb37baa   296827:
 eb8fff80069ba496c3407267e155b6f5ddeed54c   296823:
 f4b5b66ff20aba26f37fb559c5f3193866fa70ed   296815:
 36dcffdf0f7c80a2c023d40495a986dc254643fe   296799:
 29ada739c0cb549acf2a6eb5aa6d10412a32951a   296767:
 15b08bea8464090cbc70e60fd0c3c77e7d4e0aeb   296703:
 8b30f811fa69766753b2fdf34d35d3b672678d33 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 2cc9c45eca60..a746aa3eae4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2cb87c23e8514ca49c85adc5924999927bb9494
+refs/heads/master: 6d95b7fdd0bd2e28ef651da6863d75edca4c2aca
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;
 }