power: gpio-charger: balance enable/disable_irq_wake calls

commit faeed51bb65ce0241052d8dc24ac331ade12e976 upstream.

enable_irq_wakeup returns 0 in case it correctly enabled the IRQ to
generate the wakeup event (and thus resume should call disable_irq_wake).
Currently gpio-charger driver has this logic inverted. Correct that thus
correcting enable/disable_irq_wake() calls balance.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index 7536933d0ab977574ec3138c47f5c5028028a084..e5deb11bf1d5761f6ccf8be2899eb5e0171af5b3 100644 (file)
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -168,7 +168,7 @@ static int gpio_charger_suspend(struct device *dev)
 
        if (device_may_wakeup(dev))
                gpio_charger->wakeup_enabled =
-                       enable_irq_wake(gpio_charger->irq);
+                       !enable_irq_wake(gpio_charger->irq);
 
        return 0;
 }
@@ -178,7 +178,7 @@ static int gpio_charger_resume(struct device *dev)
        struct platform_device *pdev = to_platform_device(dev);
        struct gpio_charger *gpio_charger = platform_get_drvdata(pdev);
 
-       if (gpio_charger->wakeup_enabled)
+       if (device_may_wakeup(dev) && gpio_charger->wakeup_enabled)
                disable_irq_wake(gpio_charger->irq);
        power_supply_changed(&gpio_charger->charger);