summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-04-21 09:42:15 +1200
committerCommit Bot <commit-bot@chromium.org>2021-04-21 02:36:19 +0000
commitad7fc27d908a310f548fb7ab111a10876770ebbe (patch)
treefde714dd223046bf209ec0f62885095eae821c94
parent06b68e96901695c289b9ac75b4e318e39dec07f9 (diff)
downloadchrome-ec-ad7fc27d908a310f548fb7ab111a10876770ebbe.tar.gz
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 <sjg@chromium.org> Change-Id: I1f3826ef26b1255934ea96cd1541f60436546b57 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2842204 Reviewed-by: Denis Brockus <dbrockus@chromium.org>
-rw-r--r--common/battery_fuel_gauge.c2
1 files changed, 1 insertions, 1 deletions
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(&reg))