diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-08-17 14:21:47 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-08-29 16:09:15 -0700 |
| commit | f854f9f7c4433952a61b9ecfb77e989f8d3579df (patch) | |
| tree | 5f47a54164cc318dde6772d6c6b148a6ef54f7d9 | |
| parent | 9e901175dad88d48a790147053a359afbf82e12f (diff) | |
| download | chrome-ec-f854f9f7c4433952a61b9ecfb77e989f8d3579df.tar.gz | |
chgstv2: Check current battery presence instead of battery_was_removed
Currently, charge_get_state checks battery_was_removed and returns
PWR_STATE_ERROR if it's set. battery_was_removed does not reflect the
current battery presence.
This patch makes charge_get_state check the current battery presence
(curr.batt.is_present).
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=b:111969858
BRANCH=none
TEST=Boot Pantheon with/without a battery. Verify LED is on/off before and
after sysjump expectedly.
Change-Id: Id7a9d57b9b4040c488405fb2d0fec0da238eaefc
Reviewed-on: https://chromium-review.googlesource.com/1180350
Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
| -rw-r--r-- | common/charge_state_v2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 6f72d4e82b..879585b26f 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -2071,7 +2071,7 @@ enum charge_state charge_get_state(void) { switch (curr.state) { case ST_IDLE: - if (battery_seems_to_be_dead || battery_was_removed) + if (battery_seems_to_be_dead || curr.batt.is_present != BP_YES) return PWR_STATE_ERROR; return PWR_STATE_IDLE; case ST_DISCHARGE: |