diff options
author | Ben Nizette <bn@niasdigital.com> | 2009-04-17 23:35:57 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-04-17 23:42:00 -0400 |
commit | 29fa98bd9b50b5e9c17d99e961640ffafb765d71 (patch) | |
tree | cc628c458e0f0ddeef8d1308d1e1257636ad8198 | |
parent | e4bd3e591c8cc52ccf7a0b27f33aa7a5a19058d7 (diff) |
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.c | 2 |
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) | |||
235 | spin_lock_irqsave(&ts->lock, flags); | 235 | spin_lock_irqsave(&ts->lock, flags); |
236 | 236 | ||
237 | if (likely(ts->get_pendown_state())) { | 237 | if (likely(ts->get_pendown_state())) { |
238 | disable_irq(ts->irq); | 238 | disable_irq_nosync(ts->irq); |
239 | hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), | 239 | hrtimer_start(&ts->timer, ktime_set(0, TS_POLL_DELAY), |
240 | HRTIMER_MODE_REL); | 240 | HRTIMER_MODE_REL); |
241 | } | 241 | } |