mfd: cros_ec: Check for mkbp events on resume only if supported.
authorRaviChandra Sadineni <ravisadineni@chromium.org>
Mon, 20 Aug 2018 15:34:19 +0000 (08:34 -0700)
committerLee Jones <lee.jones@linaro.org>
Tue, 23 Oct 2018 07:58:34 +0000 (08:58 +0100)
Currently on every resume we check for mkbp events and notify the
clients. This helps in identifying the wakeup sources. But on devices
that do not support mkbp protocol, we might end up querying key state of
the keyboard in a loop which blocks the resume. Instead check for events
only if mkbp is supported.

Signed-off-by: RaviChandra Sadineni <ravisadineni@chromium.org>
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/cros_ec.c

index 65a9757a6d214858c1a7a0f5247bd255770e2d57..fe6f83766144f53af9cf0fd26ca1352961feefff 100644 (file)
@@ -218,7 +218,8 @@ EXPORT_SYMBOL(cros_ec_suspend);
 
 static void cros_ec_report_events_during_suspend(struct cros_ec_device *ec_dev)
 {
-       while (cros_ec_get_next_event(ec_dev, NULL) > 0)
+       while (ec_dev->mkbp_event_supported &&
+              cros_ec_get_next_event(ec_dev, NULL) > 0)
                blocking_notifier_call_chain(&ec_dev->event_notifier,
                                             1, ec_dev);
 }