* [PATCH] Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure
@ 2011-07-14 2:09 Axel Lin
2011-07-14 6:24 ` Anirudh Ghayal
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2011-07-14 2:09 UTC (permalink / raw)
To: linux-kernel
Cc: Trilok Soni, Anirudh Ghayal, Dmitry Torokhov, Samuel Ortiz,
linux-input
Make sure we are passing the same cookie in all calls to
request_any_context_irq() and free_irq().
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
drivers/input/keyboard/pmic8xxx-keypad.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c
index 6229c3e..e7cc51d 100644
--- 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:
- free_irq(kp->key_stuck_irq, NULL);
+ free_irq(kp->key_stuck_irq, kp);
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);
@@ -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);
- 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);
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure
2011-07-14 2:09 [PATCH] Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure Axel Lin
@ 2011-07-14 6:24 ` Anirudh Ghayal
0 siblings, 0 replies; 2+ messages in thread
From: Anirudh Ghayal @ 2011-07-14 6:24 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Trilok Soni, Dmitry Torokhov, Samuel Ortiz,
linux-input
On 7/14/2011 7:39 AM, Axel Lin wrote:
> Make sure we are passing the same cookie in all calls to
> request_any_context_irq() and free_irq().
>
> Signed-off-by: Axel Lin<axel.lin@gmail.com>
Acked-by: Anirudh Ghayal <aghayal@codeaurora.org>
> ---
> drivers/input/keyboard/pmic8xxx-keypad.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c
> index 6229c3e..e7cc51d 100644
> --- 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:
> - free_irq(kp->key_stuck_irq, NULL);
> + free_irq(kp->key_stuck_irq, kp);
> 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);
> @@ -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);
> - 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);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-14 6:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-14 2:09 [PATCH] Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure Axel Lin
2011-07-14 6:24 ` Anirudh Ghayal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).