From 9d97ea75969a2579e3be540709991c20a4bb00d5 Mon Sep 17 00:00:00 2001
From: Ben Nizette <bn@niasdigital.com>
Date: Thu, 16 Apr 2009 15:55:21 +1000
Subject: [PATCH] --- yaml --- r: 145523 b: refs/heads/master c:
 e749c6f21fd7dc618f61dd178b4ee739c3cb1c31 h: refs/heads/master i:   145521:
 8c348d3412dd02e1166a48c1bed3fd5bcda511cb   145519:
 b25ac92ad830dd7213e33ea5550e54608537f42d v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mmc/host/omap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0f07d751b049..f795124f2367 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 992697e9b342115dcf052ffa41d418cb4fe1a841
+refs/heads/master: e749c6f21fd7dc618f61dd178b4ee739c3cb1c31
diff --git a/trunk/drivers/mmc/host/omap.c b/trunk/drivers/mmc/host/omap.c
index bfa25c01c872..dceb5ee3bda0 100644
--- a/trunk/drivers/mmc/host/omap.c
+++ b/trunk/drivers/mmc/host/omap.c
@@ -822,7 +822,7 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 		del_timer(&host->cmd_abort_timer);
 		host->abort = 1;
 		OMAP_MMC_WRITE(host, IE, 0);
-		disable_irq(host->irq);
+		disable_irq_nosync(host->irq);
 		schedule_work(&host->cmd_abort_work);
 		return IRQ_HANDLED;
 	}