From: Ben Nizette <bn@niasdigital.com>
Date: Sat, 18 Apr 2009 03:35:57 +0000 (-0700)
Subject: Input: sa1111ps2 - use disable_irq_nosync() in irq handlers
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e4bd3e591c8cc52ccf7a0b27f33aa7a5a19058d7;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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>
---

diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 57953c0eb82f..f412c69478a8 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -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);