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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
drivers
/
input
/
keyboard
/
pmic8xxx-keypad.c
diff --git
a/drivers/input/keyboard/pmic8xxx-keypad.c
b/drivers/input/keyboard/pmic8xxx-keypad.c
index
6229c3e
..
e7cc51d
100644
(file)
--- a/
drivers/input/keyboard/pmic8xxx-keypad.c
+++ b/
drivers/input/keyboard/pmic8xxx-keypad.c
@@
-700,9
+700,9
@@
static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev)
return 0;
err_pmic_reg_read:
return 0;
err_pmic_reg_read:
- free_irq(kp->key_stuck_irq,
NULL
);
+ free_irq(kp->key_stuck_irq,
kp
);
err_req_stuck_irq:
err_req_stuck_irq:
- free_irq(kp->key_sense_irq,
NULL
);
+ free_irq(kp->key_sense_irq,
kp
);
err_gpio_config:
err_get_irq:
input_free_device(kp->input);
err_gpio_config:
err_get_irq:
input_free_device(kp->input);
@@
-717,8
+717,8
@@
static int __devexit pmic8xxx_kp_remove(struct platform_device *pdev)
struct pmic8xxx_kp *kp = platform_get_drvdata(pdev);
device_init_wakeup(&pdev->dev, 0);
struct pmic8xxx_kp *kp = platform_get_drvdata(pdev);
device_init_wakeup(&pdev->dev, 0);
- free_irq(kp->key_stuck_irq,
NULL
);
- free_irq(kp->key_sense_irq,
NULL
);
+ free_irq(kp->key_stuck_irq,
kp
);
+ free_irq(kp->key_sense_irq,
kp
);
input_unregister_device(kp->input);
kfree(kp);
input_unregister_device(kp->input);
kfree(kp);