Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e749c6f2 authored by Ben Nizette's avatar Ben Nizette Committed by Pierre Ossman
Browse files

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: default avatarBen Nizette <bn@niasdigital.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarPierre Ossman <pierre@ossman.eu>
parent 992697e9

drivers/mmc/host/omap.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}