Commit f208ce4d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v6.0' of... 

Merge tag 'thunderbolt-for-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Mika writes:
  "thunderbolt: Fix for v6.0 final

   This includes a single fix from Mario that resets the plug event delay
   back to the USB4 spec value.

   This has been in linux-next with no reported issues."

* tag 'thunderbolt-for-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Explicitly reset plug events delay back to USB4 spec value
parents f76349cf 31f87f70

drivers/thunderbolt/switch.c

+1 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,7 @@ int tb_switch_configure(struct tb_switch *sw) 
		 * additional capabilities.

		 */

		sw->config.cmuv = USB4_VERSION_1_0;

		sw->config.plug_events_delay = 0xa;



		/* Enumerate the switch */

		ret = tb_sw_write(sw, (u32 *)&sw->config + 1, TB_CFG_SWITCH,