git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
drivers
/
input
/
misc
/
twl4030-pwrbutton.c
diff --git
a/drivers/input/misc/twl4030-pwrbutton.c
b/drivers/input/misc/twl4030-pwrbutton.c
index
f16972b
..
38e4b50
100644
(file)
--- 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:
return 0;
free_irq:
- free_irq(irq,
NULL
);
+ free_irq(irq,
pwr
);
free_input_dev:
input_free_device(pwr);
return err;
free_input_dev:
input_free_device(pwr);
return err;