From a15a975fa54438c878feff742611b03b440ffded Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 26 Jun 2006 15:26:13 +0100
Subject: [PATCH] --- yaml --- r: 30649 b: refs/heads/master c:
 cfc736564fd01ee008d746913b1bbb90e3eb1f99 h: refs/heads/master i:   30647:
 a2221f342221740d9767b53a6374041c33f4eaea v: v3

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

diff --git a/[refs] b/[refs]
index 4507e0681598..173905dffcde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd701aa27e4cfab5c99c7da13d404b1f3a0aecfb
+refs/heads/master: cfc736564fd01ee008d746913b1bbb90e3eb1f99
diff --git a/trunk/drivers/mfd/ucb1x00-core.c b/trunk/drivers/mfd/ucb1x00-core.c
index aff83f966803..c8426a9bf273 100644
--- a/trunk/drivers/mfd/ucb1x00-core.c
+++ b/trunk/drivers/mfd/ucb1x00-core.c
@@ -420,8 +420,10 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb)
 	unsigned long mask;
 
 	mask = probe_irq_on();
-	if (!mask)
+	if (!mask) {
+		probe_irq_off(mask);
 		return NO_IRQ;
+	}
 
 	/*
 	 * Enable the ADC interrupt.