From ad7fc27d908a310f548fb7ab111a10876770ebbe Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 21 Apr 2021 09:42:15 +1200 Subject: battery: Correct battery_get_disconnect_state() return This cannot return a value from a different enum. Doing so produces an error with clang: battery_fuel_gauge.c:228:10: warning: implicit conversion from enumeration type 'enum ec_error_list' to different enumeration type 'enum battery_disconnect_state' [-Wenum-conversion] Fix it by returning the existing error value. BUG=none BRANCH=none TEST=CQ Signed-off-by: Simon Glass Change-Id: I1f3826ef26b1255934ea96cd1541f60436546b57 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2842204 Reviewed-by: Denis Brockus --- common/battery_fuel_gauge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/battery_fuel_gauge.c b/common/battery_fuel_gauge.c index 4a989a0db4..f839169bb2 100644 --- a/common/battery_fuel_gauge.c +++ b/common/battery_fuel_gauge.c @@ -225,7 +225,7 @@ enum battery_disconnect_state battery_get_disconnect_state(void) /* If battery type is not known, can't check CHG/DCHG FETs */ if (type == BATTERY_TYPE_COUNT) { /* Still don't know, so return here */ - return EC_ERROR_BUSY; + return BATTERY_DISCONNECT_ERROR; } if (battery_get_fet_status_regval(®)) -- cgit v1.2.1