diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-27 10:47:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-27 10:47:36 +0200 |
| commit | f208ce4d45c5884eae2b8a67bed1c3d646cafc15 (patch) | |
| tree | 18569976239f5ed8dce65f0726f4ac0893213605 /drivers/thunderbolt | |
| parent | f76349cf41451c5c42a99f18a9163377e4b364ff (diff) | |
| parent | 31f87f705b3c1635345d8e8a493697099b43e508 (diff) | |
| download | linux-f208ce4d45c5884eae2b8a67bed1c3d646cafc15.tar.bz2 | |
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
Diffstat (limited to 'drivers/thunderbolt')
| -rw-r--r-- | drivers/thunderbolt/switch.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index c63c1f4ff9dc..77d7f07ca075 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -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, |