diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-05-23 12:30:04 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-23 12:38:21 -0400 |
commit | 8c7f5f5833815af06872bd6151604e0e18e24c99 (patch) | |
tree | d6f620bcb21244c4a37941ec90dc4218afb4c9cc | |
parent | d7ecfff18451750bc3d41ca3e1d5422c5dbce796 (diff) |
Input: pxa27x_keypad - pass correct pointer to free_irq()
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>
-rw-r--r-- | drivers/input/keyboard/pxa27x_keypad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 74e30cccbeab..b674e7aca404 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
@@ -582,7 +582,7 @@ static int pxa27x_keypad_probe(struct platform_device *pdev) | |||
582 | return 0; | 582 | return 0; |
583 | 583 | ||
584 | failed_free_irq: | 584 | failed_free_irq: |
585 | free_irq(irq, pdev); | 585 | free_irq(irq, keypad); |
586 | failed_put_clk: | 586 | failed_put_clk: |
587 | clk_put(keypad->clk); | 587 | clk_put(keypad->clk); |
588 | failed_free_io: | 588 | failed_free_io: |
@@ -600,7 +600,7 @@ static int pxa27x_keypad_remove(struct platform_device *pdev) | |||
600 | struct pxa27x_keypad *keypad = platform_get_drvdata(pdev); | 600 | struct pxa27x_keypad *keypad = platform_get_drvdata(pdev); |
601 | struct resource *res; | 601 | struct resource *res; |
602 | 602 | ||
603 | free_irq(keypad->irq, pdev); | 603 | free_irq(keypad->irq, keypad); |
604 | clk_put(keypad->clk); | 604 | clk_put(keypad->clk); |
605 | 605 | ||
606 | input_unregister_device(keypad->input_dev); | 606 | input_unregister_device(keypad->input_dev); |