diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2022-05-19 11:02:10 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-19 11:02:10 -0300 |
| commit | b7007e1d615b8d4b71c28ebf790c5164fc4491d5 (patch) | |
| tree | 48c35f63dc1101d0d528b5d79c81849b99ca7c6d /drivers/usb/typec/tcpm/tcpm.c | |
| parent | 38955ef654554c94f4d91bafb9ef5c5f41a4c0f6 (diff) | |
| parent | 0e61b511dd8474280ba674590daa55f30433b7d4 (diff) | |
Merge pull request #565 from philschenker/update-to-5.4.193__update-to-2.3.7__5.4-2.3.x-imx
Update Patchlevel on Branch 5.4-2.3.x-imx from 5.4.161->5.4.193
Diffstat (limited to 'drivers/usb/typec/tcpm/tcpm.c')
| -rw-r--r-- | drivers/usb/typec/tcpm/tcpm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index b77e08b7e355..7d64a8a9d7ae 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -3167,11 +3167,7 @@ static void run_state_machine(struct tcpm_port *port) tcpm_try_src(port) ? SRC_TRY : SNK_ATTACHED, 0); - else - /* Wait for VBUS, but not forever */ - tcpm_set_state(port, PORT_RESET, PD_T_PS_SOURCE_ON); break; - case SRC_TRY: port->try_src_count++; tcpm_set_cc(port, tcpm_rp_cc(port)); @@ -3960,7 +3956,8 @@ static void _tcpm_pd_vbus_off(struct tcpm_port *port) case SNK_TRYWAIT_DEBOUNCE: break; case SNK_ATTACH_WAIT: - tcpm_set_state(port, SNK_UNATTACHED, 0); + case SNK_DEBOUNCED: + /* Do nothing, as TCPM is still waiting for vbus to reaach VSAFE5V to connect */ break; case SNK_NEGOTIATE_CAPABILITIES: |