diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-26 06:53:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-26 06:53:50 +0100 |
| commit | a560a5672826fc1e057068bda93b3d4c98d037a2 (patch) | |
| tree | 7bc3774f7ec5fa2346a86b7158f975b9a762697a /drivers/usb/typec | |
| parent | ASoC: Revert "ASoC: dt-bindings: Update example for enabling USB offload on S... (diff) | |
| parent | Linux 6.8-rc6 (diff) | |
| download | linux-a560a5672826fc1e057068bda93b3d4c98d037a2.tar.gz linux-a560a5672826fc1e057068bda93b3d4c98d037a2.zip | |
Merge v6.8-rc6 into usb-next
We need it here for the USB fixes, and it resolves a merge conflict as
reported in linux-next in drivers/usb/roles/class.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec')
| -rw-r--r-- | drivers/usb/typec/tcpm/tcpm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index d975fc525eac..c9a78f55ca48 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -4395,9 +4395,6 @@ static void tcpm_detach(struct tcpm_port *port) if (tcpm_port_is_disconnected(port)) port->hard_reset_count = 0; - port->try_src_count = 0; - port->try_snk_count = 0; - if (!port->attached) return; @@ -5596,7 +5593,8 @@ static void run_state_machine(struct tcpm_port *port) break; case PORT_RESET: tcpm_reset_port(port); - tcpm_set_cc(port, TYPEC_CC_OPEN); + tcpm_set_cc(port, tcpm_default_state(port) == SNK_UNATTACHED ? + TYPEC_CC_RD : tcpm_rp_cc(port)); tcpm_set_state(port, PORT_RESET_WAIT_OFF, PD_T_ERROR_RECOVERY); break; |