lkml.org 
[lkml]   [2015]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 032/183] power: gpio-charger: balance enable/disable_irq_wake calls
    Date
    3.16.7-ckt8 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/power/gpio-charger.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
    index a0024b252197..86e03c6d28f3 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);


    \
     
     \ /
      Last update: 2015-03-06 12:21    [W:3.167 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site