]> Pileus Git - ~andy/linux/commitdiff
Input: tsc2007 - use disable_irq_nosync() in irq handler
authorBen Nizette <bn@niasdigital.com>
Sat, 18 Apr 2009 03:35:57 +0000 (20:35 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 18 Apr 2009 03:42:00 +0000 (20:42 -0700)
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>
drivers/input/touchscreen/tsc2007.c

index 4ab070246892c5935d8482af73f0499b98b199b6..536668fbda227158beaeb0c7eec9478be72f4d56 100644 (file)
@@ -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);
        }