From 911c5ea4fbdce8f45e5cce635d2068bd1e85be8b Mon Sep 17 00:00:00 2001 From: Sam Hurst Date: Thu, 5 Dec 2019 13:58:18 -0800 Subject: TCPMv2: Don't turn off VCONN during a PR_SWAP A flag that tracks PR_SWAP was being prematurely cleared, causing VCONN to turn off. BUG=chromium:1031304 BRANCH=none TEST=make -j buildall manual tests: Using a kohaku and a Kensington dock, I verified that VCONN does not turn off during a PR_SWAP Change-Id: I2947bd50f299684d58f4cbdcd9c649f395c3d7d2 Signed-off-by: Sam Hurst Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1954311 Reviewed-by: Jett Rink --- common/usbc/usb_tc_drp_acc_trysrc_sm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index a025aad2fb..a3e6f5f67f 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -2749,7 +2749,7 @@ static void tc_attached_src_run(const int port) * Power Role Swap Request */ if (TC_CHK_FLAG(port, TC_FLAGS_DO_PR_SWAP)) { - TC_CLR_FLAG(port, TC_FLAGS_DO_PR_SWAP); + /* Clear TC_FLAGS_DO_PR_SWAP on exit */ return set_state_tc(port, TC_ATTACHED_SNK); } -- cgit v1.2.1