---

yaml --- r: 163267 b: refs/heads/master c: 0ad651c h: refs/heads/master i: 163265: b757382 163263: c97b5ee v: v3
git-mirror · Sep 17, 2009 · 8e83378 · 8e83378
1 parent 60c6a45
commit 8e83378
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce290b0e865ae19f0ae49968def0a2edcb4e6a65
+refs/heads/master: 0ad651c94c7a1f3706f63dc0174e681315e7dc81
diff --git a/trunk/drivers/mfd/ab3100-core.c b/trunk/drivers/mfd/ab3100-core.c
@@ -422,7 +422,7 @@ static irqreturn_t ab3100_irq_handler(int irq, void *data)
 	 * stuff and we will re-enable the interrupts once th
 	 * worker has finished.
 	 */
-	disable_irq(ab3100->i2c_client->irq);
+	disable_irq_nosync(irq);
 	schedule_work(&ab3100->work);
 	return IRQ_HANDLED;
 }