Browse Source

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>
Ben Nizette 16 years ago
parent
commit
e749c6f21f
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/mmc/host/omap.c

+ 1 - 1
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);
 		del_timer(&host->cmd_abort_timer);
 		host->abort = 1;
 		host->abort = 1;
 		OMAP_MMC_WRITE(host, IE, 0);
 		OMAP_MMC_WRITE(host, IE, 0);
-		disable_irq(host->irq);
+		disable_irq_nosync(host->irq);
 		schedule_work(&host->cmd_abort_work);
 		schedule_work(&host->cmd_abort_work);
 		return IRQ_HANDLED;
 		return IRQ_HANDLED;
 	}
 	}