diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-05-23 12:29:59 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-23 12:38:15 -0400 |
commit | d7ecfff18451750bc3d41ca3e1d5422c5dbce796 (patch) | |
tree | 131d001f05ffc4462114b4c0543093250a113064 /drivers/input | |
parent | edbbee595d42f501cb1325d31ab3481d2bc4be0d (diff) |
Input: ep93xx_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>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/ep93xx_keypad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index a8d5aacfb98b..47206bdba411 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c | |||
@@ -329,7 +329,7 @@ static int ep93xx_keypad_probe(struct platform_device *pdev) | |||
329 | return 0; | 329 | return 0; |
330 | 330 | ||
331 | failed_free_irq: | 331 | failed_free_irq: |
332 | free_irq(keypad->irq, pdev); | 332 | free_irq(keypad->irq, keypad); |
333 | failed_free_dev: | 333 | failed_free_dev: |
334 | input_free_device(input_dev); | 334 | input_free_device(input_dev); |
335 | failed_put_clk: | 335 | failed_put_clk: |
@@ -350,7 +350,7 @@ static int ep93xx_keypad_remove(struct platform_device *pdev) | |||
350 | struct ep93xx_keypad *keypad = platform_get_drvdata(pdev); | 350 | struct ep93xx_keypad *keypad = platform_get_drvdata(pdev); |
351 | struct resource *res; | 351 | struct resource *res; |
352 | 352 | ||
353 | free_irq(keypad->irq, pdev); | 353 | free_irq(keypad->irq, keypad); |
354 | 354 | ||
355 | if (keypad->enabled) | 355 | if (keypad->enabled) |
356 | clk_disable(keypad->clk); | 356 | clk_disable(keypad->clk); |