Commit e4bd3e59 authored Apr 17, 2009 by Ben Nizette Committed by Dmitry Torokhov Apr 17, 2009

Input: sa1111ps2 - use disable_irq_nosync() in irq handlers



disable_irq() waits 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>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

parent 0f751719

drivers/input/serio/sa1111ps2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ static irqreturn_t ps2_txint(int irq, void *dev_id)
		spin_lock(&ps2if->lock);
		status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
		if (ps2if->head == ps2if->tail) {
		disable_irq(irq);
		disable_irq_nosync(irq);
		/* done */
		} else if (status & PS2STAT_TXE) {
		sa1111_writel(ps2if->buf[ps2if->tail], ps2if->base + SA1111_PS2DATA);

Admin message