From 72e6d993954ad86d1653995c62cd86aa5e270ac1 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 18 Jul 2011 17:09:22 -0700 Subject: [PATCH] --- yaml --- r: 260785 b: refs/heads/master c: edf21d9c38b945b91d100bae59d951bce131d58b h: refs/heads/master i: 260783: dd0cda376e1c8b56df5c76ec1ca741b47857e8f9 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/pmic8xxx-keypad.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 199512d6b69a..a2d36689bd25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c204109ec1018f72114c7f19132a1109a3f0653 +refs/heads/master: edf21d9c38b945b91d100bae59d951bce131d58b diff --git a/trunk/drivers/input/keyboard/pmic8xxx-keypad.c b/trunk/drivers/input/keyboard/pmic8xxx-keypad.c index 40b02ae96f86..f2e8b9a347df 100644 --- a/trunk/drivers/input/keyboard/pmic8xxx-keypad.c +++ b/trunk/drivers/input/keyboard/pmic8xxx-keypad.c @@ -699,9 +699,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); @@ -716,8 +716,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);