From: Ben Nizette <bn@niasdigital.com>
Date: Thu, 16 Apr 2009 05:55:21 +0000 (+1000)
Subject: mmc/omap: Use disable_irq_nosync() from within irq handlers.
X-Git-Tag: v2.6.30~15^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e749c6f21fd7dc618f61dd178b4ee739c3cb1c31;p=~shefty%2Frdma-dev.git

mmc/omap: Use disable_irq_nosync() from within irq handlers.

disable_irq() should wait for all running handlers to complete
before returning.  As such, if it's used to disable an interrupt
from that interrupt's handler it will deadlock.  This replaces
the dangerous instances with the _nosync() variant which doesn't
have this problem.

Signed-off-by: Ben Nizette <bn@niasdigital.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
---

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index bfa25c01c87..dceb5ee3bda 100644
--- a/drivers/mmc/host/omap.c
+++ b/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;
 	}