Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edf21d9c authored by Axel Lin's avatar Axel Lin Committed by Dmitry Torokhov
Browse files

Input: pmic8xxx-keypad - fix a leak of the IRQ during init failure 



Make sure we are passing the same cookie in all calls to
request_any_context_irq() and free_irq().

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 2c204109

drivers/input/keyboard/pmic8xxx-keypad.c

+4 −4
Original line number Diff line number Diff line
@@ -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);