diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-01-22 12:07:04 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-28 20:22:26 +0000 |
| commit | 1b4ce5849d520b67447bdc5b94e346432eac2126 (patch) | |
| tree | a640609b5c024c0020ccb48e121b496fa686f1c2 /board/kukui | |
| parent | f1e626bf81bc511d713fd306395d00e857764c09 (diff) | |
| download | chrome-ec-1b4ce5849d520b67447bdc5b94e346432eac2126.tar.gz | |
Charger: change get_vbus_voltage to return EC error
The other driver structure members return an ec_error_list value and
fill in parameters to return data. This commit changes the
get_vbus_voltage call to follow that model.
BRANCH=None
BUG=b:147672225
TEST=builds
Change-Id: I7308502a9734274dd308b830762493c4d70d147a
Signed-off-by: Diana Z <dzigterman@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2015340
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'board/kukui')
| -rw-r--r-- | board/kukui/board.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/board/kukui/board.c b/board/kukui/board.c index 4b9516eb7a..91b989aec8 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -566,6 +566,7 @@ void usb_charger_set_switches(int port, enum usb_switch setting) */ int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) { + int voltage; /* * Though we have a more tolerant range (3.9V~13.4V), setting 4400 to * prevent from a bad charger crashed. @@ -576,7 +577,10 @@ int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) * try to raise this value to 4600. (when it says it read 4400, it is * actually close to 4600) */ - return charger_get_vbus_voltage(port) < 4400; + if (charger_get_vbus_voltage(port, &voltage)) + voltage = 0; + + return voltage < 4400; } __override int board_charge_port_is_sink(int port) |