]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Input: pxa27x_keypad - pass correct pointer to free_irq()
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 23 May 2013 16:30:04 +0000 (09:30 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 May 2013 16:38:21 +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>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/pxa27x_keypad.c

index 74e30cccbeab06c690b74291aa302203bdb9b0d0..b674e7aca404016834f28eb9be4cfacc4f37bc99 100644 (file)
@@ -582,7 +582,7 @@ static int pxa27x_keypad_probe(struct platform_device *pdev)
        return 0;
 
 failed_free_irq:
-       free_irq(irq, pdev);
+       free_irq(irq, keypad);
 failed_put_clk:
        clk_put(keypad->clk);
 failed_free_io:
@@ -600,7 +600,7 @@ static int pxa27x_keypad_remove(struct platform_device *pdev)
        struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
        struct resource *res;
 
-       free_irq(keypad->irq, pdev);
+       free_irq(keypad->irq, keypad);
        clk_put(keypad->clk);
 
        input_unregister_device(keypad->input_dev);