summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-04-28 06:41:19 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-04-28 08:11:33 +0200
commit5c9db64888ecabfb170081335f30e3d7192fbcf4 (patch)
tree6fa985a63548bae965d89c70c964095ea07f359f /drivers/input
parentInput: omap-keypad - fix a wrong free_irq() parameter (diff)
downloadlinux-5c9db64888ecabfb170081335f30e3d7192fbcf4.tar.xz
linux-5c9db64888ecabfb170081335f30e3d7192fbcf4.zip
Input: twl4030-pwrbutton - fix a leak of the IRQ during init failure
In twl4030_pwrbutton_probe error path, free_irq() was using NULL rather than the driver data as the data pointer so free_irq() wouldn't have matched. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/twl4030-pwrbutton.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index f16972bddca4..38e4b507b94c 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -89,7 +89,7 @@ static int __init twl4030_pwrbutton_probe(struct platform_device *pdev)
return 0;
free_irq:
- free_irq(irq, NULL);
+ free_irq(irq, pwr);
free_input_dev:
input_free_device(pwr);
return err;