]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Input: ucb1400 - use disable_irq_nosync() in irq handler
authorBen Nizette <bn@niasdigital.com>
Sat, 18 Apr 2009 03:35:58 +0000 (20:35 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 18 Apr 2009 03:42:06 +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/ucb1400_ts.c

index e868264fe79915d5ad904d35836d7d7b762e8445..f100c7f4c1dbf2ea72ad771f0775e39d666dd3ed 100644 (file)
@@ -256,7 +256,7 @@ static irqreturn_t ucb1400_hard_irq(int irqnr, void *devid)
        struct ucb1400_ts *ucb = devid;
 
        if (irqnr == ucb->irq) {
-               disable_irq(ucb->irq);
+               disable_irq_nosync(ucb->irq);
                ucb->irq_pending = 1;
                wake_up(&ucb->ts_wait);
                return IRQ_HANDLED;