]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Input: ep93xx_keypad - pass correct pointer to free_irq()
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 23 May 2013 16:29:59 +0000 (09:29 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 May 2013 16:38:15 +0000 (09:38 -0700)
free_irq() expects the same pointer that was passed to request_irq(),
otherwise the IRQ is not freed.

The issue was found using the following coccinelle script:

<smpl>
@r1@
type T;
T devid;
@@
request_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>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/ep93xx_keypad.c

index a8d5aacfb98b06b8839671af0d8af443e6abcb64..47206bdba4113a54db431d581a62b84da93b28ed 100644 (file)
@@ -329,7 +329,7 @@ static int ep93xx_keypad_probe(struct platform_device *pdev)
        return 0;
 
 failed_free_irq:
-       free_irq(keypad->irq, pdev);
+       free_irq(keypad->irq, keypad);
 failed_free_dev:
        input_free_device(input_dev);
 failed_put_clk:
@@ -350,7 +350,7 @@ static int ep93xx_keypad_remove(struct platform_device *pdev)
        struct ep93xx_keypad *keypad = platform_get_drvdata(pdev);
        struct resource *res;
 
-       free_irq(keypad->irq, pdev);
+       free_irq(keypad->irq, keypad);
 
        if (keypad->enabled)
                clk_disable(keypad->clk);