diff options
| author | Devin Lu <devin.lu@quantatw.com> | 2019-11-18 11:12:11 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-21 18:04:41 +0000 |
| commit | 052ed9c30e9fca104ac151920de92f8a8f76fc07 (patch) | |
| tree | 9898123d208de7db0341fef802c8b5b2a6f1cf02 /board | |
| parent | 293c23bb4378843d992c8ba6cc4bd2c626495877 (diff) | |
| download | chrome-ec-052ed9c30e9fca104ac151920de92f8a8f76fc07.tar.gz | |
kappa: fix charge/discharge control setting order
Clone form CL:1916160
BUG=none
BRANCH=none
TEST=make BOARD=kappa
Change-Id: I18905f7ace402debf1fad93e72b8a86ee27d1f50
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1918986
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/kappa/board.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/kappa/board.c b/board/kappa/board.c index f8274dd6a5..fd1b1f90cc 100644 --- a/board/kappa/board.c +++ b/board/kappa/board.c @@ -140,7 +140,7 @@ int board_set_active_charge_port(int charge_port) CPRINTS("New chg p%d", charge_port); /* ignore all request when discharge mode is on */ - if (force_discharge) + if (force_discharge && charge_port != CHARGE_PORT_NONE) return EC_SUCCESS; switch (charge_port) { @@ -186,12 +186,12 @@ int board_discharge_on_ac(int enable) port = charge_manager_get_active_charge_port(); } - ret = board_set_active_charge_port(port); + ret = charger_discharge_on_ac(enable); if (ret) return ret; force_discharge = enable; - return charger_discharge_on_ac(enable); + return board_set_active_charge_port(port); } int pd_snk_is_vbus_provided(int port) |