diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-12-08 14:23:37 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-12-11 04:59:55 +0000 |
| commit | e1058a41ca850c8d1513021390defc5a4e5c4b07 (patch) | |
| tree | 68865248f36da157a443e0f6061c13a2da2da9ad | |
| parent | 23fc8c22f15c4ffb5a49fa662c4cbb209811413d (diff) | |
| download | chrome-ec-e1058a41ca850c8d1513021390defc5a4e5c4b07.tar.gz | |
Charger: Silent error retrieving CHARGE_PORT_NONE input
In OCPC, the charger_get_params() function will regularly be calling
charger_get_input_current_limit() with the active charger chip. This
may be CHARGE_PORT_NONE if the board is not currently charging. In
these cases, silently return an invalid status.
BRANCH=None
BUG=None
TEST=on drawcia, confirm no console spam with no active charger chip
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: I9a6b85584488f9381b1e1b8d7527b7ebd68a75e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2580838
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | common/charger.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/charger.c b/common/charger.c index 8225b5683f..4b75d2e5ef 100644 --- a/common/charger.c +++ b/common/charger.c @@ -473,7 +473,11 @@ enum ec_error_list charger_set_input_current_limit(int chgnum, enum ec_error_list charger_get_input_current_limit(int chgnum, int *input_current) { - if (chgnum < 0 || chgnum >= board_get_charger_chip_count()) { + /* Note: may be called with CHARGE_PORT_NONE regularly */ + if (chgnum < 0) + return EC_ERROR_INVAL; + + if (chgnum >= board_get_charger_chip_count()) { CPRINTS("%s(%d) Invalid charger!", __func__, chgnum); return EC_ERROR_INVAL; } |