summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Nizette <bn@niasdigital.com>2009-04-17 20:35:57 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-04-17 20:42:00 -0700
commit29fa98bd9b50b5e9c17d99e961640ffafb765d71 (patch)
treecc628c458e0f0ddeef8d1308d1e1257636ad8198
parente4bd3e591c8cc52ccf7a0b27f33aa7a5a19058d7 (diff)
downloadblackbird-op-linux-29fa98bd9b50b5e9c17d99e961640ffafb765d71.tar.gz
blackbird-op-linux-29fa98bd9b50b5e9c17d99e961640ffafb765d71.zip
Input: tsc2007 - use disable_irq_nosync() in irq handler
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>
-rw-r--r--drivers/input/touchscreen/tsc2007.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c
index 4ab070246892..536668fbda22 100644
--- a/drivers/input/touchscreen/tsc2007.c
+++ b/drivers/input/touchscreen/tsc2007.c
@@ -235,7 +235,7 @@ static irqreturn_t tsc2007_irq(int irq, void *handle)
spin_lock_irqsave(&ts->lock, flags);
if (likely(ts->get_pendown_state())) {
- disable_irq(ts->irq);
+ disable_irq_nosync(ts->irq);
hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY),
HRTIMER_MODE_REL);
}
OpenPOWER on IntegriCloud