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 /common/charge_manager.c | |
| 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 'common/charge_manager.c')
| -rw-r--r-- | common/charge_manager.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common/charge_manager.c b/common/charge_manager.c index f9c6d8060c..9f2ee4132f 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -459,7 +459,12 @@ static void charge_manager_fill_power_info(int port, r->meas.voltage_now = 5000; else { #if defined(CONFIG_USB_PD_VBUS_MEASURE_CHARGER) - r->meas.voltage_now = charger_get_vbus_voltage(port); + int voltage; + + if (charger_get_vbus_voltage(port, &voltage)) + r->meas.voltage_now = 0; + else + r->meas.voltage_now = voltage; #elif defined(CONFIG_USB_PD_VBUS_MEASURE_TCPC) r->meas.voltage_now = tcpc_get_vbus_voltage(port); #elif defined(CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT) |