From: Dmitry Eremin-Solenikov Date: Thu, 15 Jan 2015 02:00:37 +0000 (+0300) Subject: power: gpio-charger: balance enable/disable_irq_wake calls X-Git-Tag: v3.16.35~2797 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=831296d31c15bb2c286ee7aad627f365eb21f116;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Sebastian Reichel Signed-off-by: Luis Henriques --- diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c index a0024b252197d..86e03c6d28f3c 100644 --- 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);