Merge tag 'powerpc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-artful-kernel.git] / drivers / mfd / cros_ec.c

diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
index dc6ce90916949d0821ca5d72f27d266a99294dab..b0ca5a4c841e0c98828efbcebf42caca3223006b 100644 (file)
--- a/drivers/mfd/cros_ec.c
+++ b/drivers/mfd/cros_ec.c
@@ -54,12 +54,19 @@ static const struct mfd_cell ec_pd_cell = {
 static irqreturn_t ec_irq_thread(int irq, void *data)
 {
        struct cros_ec_device *ec_dev = data;
+       bool wake_event = true;
        int ret;
 
-       if (device_may_wakeup(ec_dev->dev))
+       ret = cros_ec_get_next_event(ec_dev, &wake_event);
+
+       /*
+        * Signal only if wake host events or any interrupt if
+        * cros_ec_get_next_event() returned an error (default value for
+        * wake_event is true)
+        */
+       if (wake_event && device_may_wakeup(ec_dev->dev))
                pm_wakeup_event(ec_dev->dev, 0);
 
-       ret = cros_ec_get_next_event(ec_dev);
        if (ret > 0)
                blocking_notifier_call_chain(&ec_dev->event_notifier,
                                             0, ec_dev);
@@ -224,7 +231,7 @@ EXPORT_SYMBOL(cros_ec_suspend);
 
 static void cros_ec_drain_events(struct cros_ec_device *ec_dev)
 {
-       while (cros_ec_get_next_event(ec_dev) > 0)
+       while (cros_ec_get_next_event(ec_dev, NULL) > 0)
                blocking_notifier_call_chain(&ec_dev->event_notifier,
                                             1, ec_dev);
 }