OSDN Git Service

Input: twl4030_keypad - pass correct pointer to free_irq()
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 23 May 2013 16:30:08 +0000 (09:30 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 May 2013 16:38:24 +0000 (09:38 -0700)
free_irq() expects the same pointer that was passed to
request_threaded_irq(), otherwise the IRQ is not freed.

The issue was found using the following coccinelle script:

<smpl>
@r1@
type T;
T devid;
@@
request_threaded_irq(..., devid)

@r2@
type r1.T;
T devid;
position p;
@@
free_irq@p(..., devid)

@@
position p != r2.p;
@@
*free_irq@p(...)
</smpl>

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/twl4030_keypad.c

index f05ee1d..d2d178c 100644 (file)
@@ -422,7 +422,7 @@ static int twl4030_kp_probe(struct platform_device *pdev)
 err3:
        /* mask all events - we don't care about the result */
        (void) twl4030_kpwrite_u8(kp, 0xff, KEYP_IMR1);
-       free_irq(kp->irq, NULL);
+       free_irq(kp->irq, kp);
 err2:
        input_unregister_device(input);
        input = NULL;