From 41328938081a38b250bbad69829bbe091abf4e6a Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 4 Mar 2018 00:05:12 -0600 Subject: [PATCH] ec/chromeec: Fix check for UHEPI support Commit 1dfc2c3 [google/chromeec: Enable unified host event programming interface] added support for UHEPI, but google_chromeec_is_uhepi_supported() incorrectly treats negative error return codes from google_chromeec_check_feature() as supported. Fix this check to only treat positive return values as supported, as per the original intent. Test: boot google/lulu, verify cbmem console reports UHEPI not supported even if feature check returns error code, verify lid/kb wake events correctly wakes the device from S3/sleep. Change-Id: I7846efb340bc1546b074e8502daf906c444bd146 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/24982 Reviewed-by: Aaron Durbin Reviewed-by: Furquan Shaikh Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) --- src/ec/google/chromeec/ec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c index ef7a217c2d..28625e4096 100644 --- a/src/ec/google/chromeec/ec.c +++ b/src/ec/google/chromeec/ec.c @@ -224,7 +224,7 @@ bool google_chromeec_is_uhepi_supported(void) if (!uhepi_support) { uhepi_support = google_chromeec_check_feature - (EC_FEATURE_UNIFIED_WAKE_MASKS) ? UHEPI_SUPPORTED : + (EC_FEATURE_UNIFIED_WAKE_MASKS) > 0 ? UHEPI_SUPPORTED : UHEPI_NOT_SUPPORTED; printk(BIOS_DEBUG, "Chrome EC: UHEPI %s\n", uhepi_support == UHEPI_SUPPORTED ?