summaryrefslogtreecommitdiff
path: root/drivers/input/serio/sa1111ps2.c
diff options
context:
space:
mode:
authorBen Nizette <bn@niasdigital.com>2009-04-18 03:35:57 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-04-18 03:41:54 (GMT)
commite4bd3e591c8cc52ccf7a0b27f33aa7a5a19058d7 (patch)
tree45288c39392bcb0f1c0993863cc3492c01109f13 /drivers/input/serio/sa1111ps2.c
parent0f751719e4e689efbe537233552e5f0529ecb8ce (diff)
downloadlinux-fsl-qoriq-e4bd3e591c8cc52ccf7a0b27f33aa7a5a19058d7.tar.xz
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>
Diffstat (limited to 'drivers/input/serio/sa1111ps2.c')
-rw-r--r--drivers/input/serio/sa1111ps2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index 57953c0..f412c69 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);