From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 5 Nov 2024 08:55:37 +0000 (+0100)
Subject: Merge v6.12-rc6 into usb-next
X-Git-Tag: v6.13-rc1~31^2~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85c4efbe6088;p=thirdparty%2Flinux.git

Merge v6.12-rc6 into usb-next

We need the USB fixes in here as well, and this resolves a merge
conflict in:
	drivers/usb/typec/tcpm/tcpm.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20241101150730.090dc30f@canb.auug.org.au
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

85c4efbe608887cbce675fad3288172046f74713
diff --cc drivers/usb/typec/tcpm/tcpm.c
index a8fcca029e784,7ae341a403424..0334a41c710c0
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@@ -5055,10 -5042,13 +5056,14 @@@ static void run_state_machine(struct tc
  		if (port->vbus_never_low) {
  			port->vbus_never_low = false;
  			tcpm_set_state(port, SNK_SOFT_RESET,
 -				       PD_T_SINK_WAIT_CAP);
 +				       port->timings.sink_wait_cap_time);
  		} else {
+ 			if (!port->self_powered)
+ 				upcoming_state = SNK_WAIT_CAPABILITIES_TIMEOUT;
+ 			else
+ 				upcoming_state = hard_reset_state(port);
 -			tcpm_set_state(port, upcoming_state, PD_T_SINK_WAIT_CAP);
 +			tcpm_set_state(port, SNK_WAIT_CAPABILITIES_TIMEOUT,
 +				       port->timings.sink_wait_cap_time);
  		}
  		break;
  	case SNK_WAIT_CAPABILITIES_TIMEOUT: