summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaviChandra Sadineni <ravisadineni@chromium.org>2018-08-20 17:34:19 +0200
committerLee Jones <lee.jones@linaro.org>2018-10-23 09:58:34 +0200
commit61cc15dac01ae84281222452e338ca060179d8b1 (patch)
tree4982859a49f016abc8ba10cc3df2a8b4fe84f8a0
parentmfd: adp5520: Update MODULE AUTHOR email address (diff)
downloadlinux-61cc15dac01ae84281222452e338ca060179d8b1.tar.xz
linux-61cc15dac01ae84281222452e338ca060179d8b1.zip
mfd: cros_ec: Check for mkbp events on resume only if supported.
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>
-rw-r--r--drivers/mfd/cros_ec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c
index 65a9757a6d21..fe6f83766144 100644
--- a/drivers/mfd/cros_ec.c
+++ b/drivers/mfd/cros_ec.c
@@ -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);
}