From 8e83378f085214d0ec9cdc240f40e5be7c0d647b Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@stericsson.com>
Date: Thu, 13 Aug 2009 11:50:01 +0200
Subject: [PATCH] --- yaml --- r: 163267 b: refs/heads/master c:
 0ad651c94c7a1f3706f63dc0174e681315e7dc81 h: refs/heads/master i:   163265:
 b757382f563b333c69a60dcf208b333eb5040a91   163263:
 c97b5ee23bf2303bdf9eaa454338a25af4be896b v: v3

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

diff --git a/[refs] b/[refs]
index a63f1593270e..ed2b28fa1324 100644
--- 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
index bba534ba8c65..1d8ac1a1e304 100644
--- 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;
 }