summaryrefslogtreecommitdiffstats
path: root/drivers/thunderbolt/switch.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-01 09:48:28 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-01 09:48:28 +0200
commit6b6c71e897e2bfa6acf8583daf80970cb0a9f87e (patch)
treed2b32c2d1a08639f8225b3604c8e781b64f9635e /drivers/thunderbolt/switch.c
parentLinux 5.9-rc3 (diff)
parentthunderbolt: Use maximum USB3 link rate when reclaiming if link is not up (diff)
downloadlinux-6b6c71e897e2bfa6acf8583daf80970cb0a9f87e.tar.xz
linux-6b6c71e897e2bfa6acf8583daf80970cb0a9f87e.zip
Merge tag 'thunderbolt-for-v5.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus
Mika writes: thunderbolt: Fixes for v5.9-rc4 This includes two fixes, one that fixes a regression around reboot and other that uses a correct link rate when USB3 bandwidth is reclaimed when the link is not up. Both have been in linux-next with no reported issues. * tag 'thunderbolt-for-v5.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: thunderbolt: Use maximum USB3 link rate when reclaiming if link is not up thunderbolt: Disable ports that are not implemented
Diffstat (limited to 'drivers/thunderbolt/switch.c')
-rw-r--r--drivers/thunderbolt/switch.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 3845db569e4c..a921de9ce7cb 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -684,6 +684,7 @@ static int tb_init_port(struct tb_port *port)
if (res == -ENODEV) {
tb_dbg(port->sw->tb, " Port %d: not implemented\n",
port->port);
+ port->disabled = true;
return 0;
}
return res;