summaryrefslogtreecommitdiff
path: root/drivers/input/keyboard/w90p910_keypad.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-05-23 20:30:12 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-05-23 20:38:28 +0400
commitf0886a66295ccd9c81eb0cceb596e5fbc19dc2ac (patch)
tree5bb66a9b33669eb00183124d84f7fa01e934c262 /drivers/input/keyboard/w90p910_keypad.c
parent994c755a197df16aa8fd2a5f2de48500142494a0 (diff)
downloadlinux-f0886a66295ccd9c81eb0cceb596e5fbc19dc2ac.tar.xz
Input: w90p910_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>
Diffstat (limited to 'drivers/input/keyboard/w90p910_keypad.c')
-rw-r--r--drivers/input/keyboard/w90p910_keypad.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c
index 72e6a56a2eba..7b039162a3f8 100644
--- a/drivers/input/keyboard/w90p910_keypad.c
+++ b/drivers/input/keyboard/w90p910_keypad.c
@@ -221,7 +221,7 @@ static int w90p910_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:
@@ -239,7 +239,7 @@ static int w90p910_keypad_remove(struct platform_device *pdev)
struct w90p910_keypad *keypad = platform_get_drvdata(pdev);
struct resource *res;
- free_irq(keypad->irq, pdev);
+ free_irq(keypad->irq, keypad);
clk_put(keypad->clk);