summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-05-23 09:30:08 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-05-23 09:38:24 -0700
commit994c755a197df16aa8fd2a5f2de48500142494a0 (patch)
tree4cffc11b68919c21173b12bdee0eca867d2dc04d
parent8c7f5f5833815af06872bd6151604e0e18e24c99 (diff)
downloadlinux-994c755a197df16aa8fd2a5f2de48500142494a0.tar.gz
linux-994c755a197df16aa8fd2a5f2de48500142494a0.tar.bz2
linux-994c755a197df16aa8fd2a5f2de48500142494a0.zip
Input: twl4030_keypad - pass correct pointer to free_irq()
free_irq() expects the same pointer that was passed to request_threaded_irq(), otherwise the IRQ is not freed. The issue was found using the following coccinelle script: <smpl> @r1@ type T; T devid; @@ request_threaded_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/twl4030_keypad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c
index f05ee1db7e64..d2d178c84ea7 100644
--- a/drivers/input/keyboard/twl4030_keypad.c
+++ b/drivers/input/keyboard/twl4030_keypad.c
@@ -422,7 +422,7 @@ static int twl4030_kp_probe(struct platform_device *pdev)
err3:
/* mask all events - we don't care about the result */
(void) twl4030_kpwrite_u8(kp, 0xff, KEYP_IMR1);
- free_irq(kp->irq, NULL);
+ free_irq(kp->irq, kp);
err2:
input_unregister_device(input);
input = NULL;