From 1dccd0450e7ba7cfa4d61fbd0ddac4c910b5b763 Mon Sep 17 00:00:00 2001 From: Alec Berg Date: Fri, 27 Feb 2015 13:21:25 -0800 Subject: [PATCH] charge_state_v2: return correct host command error codes Return host command error codes for EC_CMD_CHARGE_CONTROL instead of returning the result of EC functions which typically return element from enum ec_error_list, which is a different error list. BUG=chrome-os-partner:37171 BRANCH=samus TEST=make -j buildall Change-Id: Ia13cc8a2f747ddeafdc059c6e575dcc2f5b20b8d Signed-off-by: Alec Berg Reviewed-on: https://chromium-review.googlesource.com/254721 Reviewed-by: Duncan Laurie Reviewed-by: Bill Richardson --- common/charge_state_v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 9ee92396c0..db5966ee0a 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -981,12 +981,12 @@ static int charge_command_charge_control(struct host_cmd_handler_args *args) rv = charge_force_idle(p->mode != CHARGE_CONTROL_NORMAL); if (rv != EC_SUCCESS) - return rv; + return EC_RES_ERROR; #ifdef CONFIG_CHARGER_DISCHARGE_ON_AC rv = board_discharge_on_ac(p->mode == CHARGE_CONTROL_DISCHARGE); if (rv != EC_SUCCESS) - return rv; + return EC_RES_ERROR; #endif return EC_RES_SUCCESS;