diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2015-01-14 21:00:37 -0500 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2015-01-20 07:58:31 -0500 |
commit | faeed51bb65ce0241052d8dc24ac331ade12e976 (patch) | |
tree | 2d57bd6d3e6df6437956ba6ecde15fd058298fb6 | |
parent | b847dd96e659c13be9d94c3c19b51cdf0feb1c99 (diff) |
power: gpio-charger: balance enable/disable_irq_wake calls
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.
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
-rw-r--r-- | drivers/power/gpio-charger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c index aef74bdf7ab3..b7424c8501f1 100644 --- a/drivers/power/gpio-charger.c +++ b/drivers/power/gpio-charger.c | |||
@@ -229,7 +229,7 @@ static int gpio_charger_suspend(struct device *dev) | |||
229 | 229 | ||
230 | if (device_may_wakeup(dev)) | 230 | if (device_may_wakeup(dev)) |
231 | gpio_charger->wakeup_enabled = | 231 | gpio_charger->wakeup_enabled = |
232 | enable_irq_wake(gpio_charger->irq); | 232 | !enable_irq_wake(gpio_charger->irq); |
233 | 233 | ||
234 | return 0; | 234 | return 0; |
235 | } | 235 | } |
@@ -239,7 +239,7 @@ static int gpio_charger_resume(struct device *dev) | |||
239 | struct platform_device *pdev = to_platform_device(dev); | 239 | struct platform_device *pdev = to_platform_device(dev); |
240 | struct gpio_charger *gpio_charger = platform_get_drvdata(pdev); | 240 | struct gpio_charger *gpio_charger = platform_get_drvdata(pdev); |
241 | 241 | ||
242 | if (gpio_charger->wakeup_enabled) | 242 | if (device_may_wakeup(dev) && gpio_charger->wakeup_enabled) |
243 | disable_irq_wake(gpio_charger->irq); | 243 | disable_irq_wake(gpio_charger->irq); |
244 | power_supply_changed(&gpio_charger->charger); | 244 | power_supply_changed(&gpio_charger->charger); |
245 | 245 | ||