Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / drivers / input / misc / pmic8xxx-pwrkey.c

diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c
index 4b811be739742fc6d29a2a0290de8b951a334f0d..b49b738aa9c69c5eb62207bc69b518b4fbe18af0 100644 (file)
--- a/drivers/input/misc/pmic8xxx-pwrkey.c
+++ b/drivers/input/misc/pmic8xxx-pwrkey.c
@@ -175,9 +175,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
        return 0;
 
 free_press_irq:
-       free_irq(key_press_irq, NULL);
+       free_irq(key_press_irq, pwrkey);
 unreg_input_dev:
-       platform_set_drvdata(pdev, NULL);
        input_unregister_device(pwr);
        pwr = NULL;
 free_input_dev:
@@ -198,7 +197,6 @@ static int pmic8xxx_pwrkey_remove(struct platform_device *pdev)
        free_irq(key_press_irq, pwrkey);
        free_irq(key_release_irq, pwrkey);
        input_unregister_device(pwrkey->pwr);
-       platform_set_drvdata(pdev, NULL);
        kfree(pwrkey);
 
        return 0;