summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2022-03-10 17:27:32 +0000
committerCommit Bot <commit-bot@chromium.org>2022-03-12 05:22:46 +0000
commit550f6384d82a563d85248d8a740931257b11250c (patch)
tree9c354810ff20e14e2bef57d2c361fdafc2fb4019
parent3b1c412971e5d4f2036b313906323e56aece6fde (diff)
downloadchrome-ec-550f6384d82a563d85248d8a740931257b11250c.tar.gz
battery: Set EC_BATT_FLAG_INVALID_DATA correctly
There is a typo in the logic where EC_BATT_FLAG_INVALID_DATA is set. Because of this, currently, EC_BATT_FLAG_INVALID_DATA is reported to the host only if BATT_FLAG_BAD_CURRENT is set. BATT_FLAG_BAD_CURRENT happens to be 0x20 which is equal to EC_BATT_FLAG_INVALID_DATA. (This originates from I3c428c850020a29b3f452504b60b52946a04c503.) This patch corrects the logic by changing EC_BATT_FLAG_INVALID_DATA to BATT_FLAG_BAD_ANY. BUG=b:65697962,b:65697620 BRANCH=None TEST=None Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Change-Id: I7504932f078ce797daf8e5c017b7835c90220a99 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3516912 Reviewed-by: caveh jalali <caveh@chromium.org>
-rw-r--r--common/battery_v1.c2
-rw-r--r--common/battery_v2.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/battery_v1.c b/common/battery_v1.c
index 3b18f43ee5..d6fc42affb 100644
--- a/common/battery_v1.c
+++ b/common/battery_v1.c
@@ -121,7 +121,7 @@ void update_dynamic_battery_info(void)
batt_present = 0;
}
- if (curr->batt.flags & EC_BATT_FLAG_INVALID_DATA)
+ if (curr->batt.flags & BATT_FLAG_BAD_ANY)
tmp |= EC_BATT_FLAG_INVALID_DATA;
if (!(curr->batt.flags & BATT_FLAG_BAD_VOLTAGE))
diff --git a/common/battery_v2.c b/common/battery_v2.c
index 6445e1d762..77428b7bc9 100644
--- a/common/battery_v2.c
+++ b/common/battery_v2.c
@@ -317,7 +317,7 @@ void update_dynamic_battery_info(void)
batt_present = 0;
}
- if (curr->batt.flags & EC_BATT_FLAG_INVALID_DATA)
+ if (curr->batt.flags & BATT_FLAG_BAD_ANY)
tmp |= EC_BATT_FLAG_INVALID_DATA;
if (!(curr->batt.flags & BATT_FLAG_BAD_VOLTAGE))