---

yaml --- r: 30649 b: refs/heads/master c: cfc7365 h: refs/heads/master i: 30647: a2221f3 v: v3
git-mirror · Jun 26, 2006 · a15a975 · a15a975
1 parent 5d21914
commit a15a975
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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.