diff options
| author | Jett Rink <jettrink@chromium.org> | 2019-10-02 15:54:57 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-14 16:28:28 +0000 |
| commit | 8a8f6069bebc6665038456079984b812665cd2d1 (patch) | |
| tree | 3fd259837825d3e5ce12a9d0eb94413948fe914a | |
| parent | 8e7a99e26b40ff5a8b801567d61b39b24d61db38 (diff) | |
| download | chrome-ec-8a8f6069bebc6665038456079984b812665cd2d1.tar.gz | |
usbc: fix pe_src_discovery return issue
We were returning early within pe_src_discovery state and not giving
other conditions a chance to evaluate and transition states.
BRANCH=none
BUG=none
TEST=builds
Change-Id: If438479b5a8bf2a703760f84a85c48bc7db72507
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1837998
Tested-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
| -rw-r--r-- | common/usbc/usb_pe_drp_sm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index 4b3272e25e..7b9b9e8e9b 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -1014,11 +1014,13 @@ static void pe_src_discovery_run(int port) * 3) And CapsCounter > nCapsCount. */ if (get_time().val > pe[port].source_cap_timer) { - if (pe[port].caps_counter <= N_CAPS_COUNT) + if (pe[port].caps_counter <= N_CAPS_COUNT) { set_state_pe(port, PE_SRC_SEND_CAPABILITIES); - else if (!PE_CHK_FLAG(port, PE_FLAGS_PD_CONNECTION)) + return; + } else if (!PE_CHK_FLAG(port, PE_FLAGS_PD_CONNECTION)) { set_state_pe(port, PE_SRC_DISABLED); - return; + return; + } } /* |