diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-05-23 12:30:12 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-23 12:38:28 -0400 |
commit | f0886a66295ccd9c81eb0cceb596e5fbc19dc2ac (patch) | |
tree | 5bb66a9b33669eb00183124d84f7fa01e934c262 | |
parent | 994c755a197df16aa8fd2a5f2de48500142494a0 (diff) |
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>
-rw-r--r-- | drivers/input/keyboard/w90p910_keypad.c | 4 |
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) | |||
221 | return 0; | 221 | return 0; |
222 | 222 | ||
223 | failed_free_irq: | 223 | failed_free_irq: |
224 | free_irq(irq, pdev); | 224 | free_irq(irq, keypad); |
225 | failed_put_clk: | 225 | failed_put_clk: |
226 | clk_put(keypad->clk); | 226 | clk_put(keypad->clk); |
227 | failed_free_io: | 227 | failed_free_io: |
@@ -239,7 +239,7 @@ static int w90p910_keypad_remove(struct platform_device *pdev) | |||
239 | struct w90p910_keypad *keypad = platform_get_drvdata(pdev); | 239 | struct w90p910_keypad *keypad = platform_get_drvdata(pdev); |
240 | struct resource *res; | 240 | struct resource *res; |
241 | 241 | ||
242 | free_irq(keypad->irq, pdev); | 242 | free_irq(keypad->irq, keypad); |
243 | 243 | ||
244 | clk_put(keypad->clk); | 244 | clk_put(keypad->clk); |
245 | 245 | ||