Skip to content

Commit 3c4a311

Browse files
committed
Merge tag 'thunderbolt-for-v6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus
Mika writes: thunderbolt: Fix for v6.8-rc7 This includes one USB4/Thunderbolt fix for v6.8-rc7: - Fix NULL pointer dereference in tb_port_update_credits() on Apple Thunderbolt 1 hardware. This has been in linux-next with no reported issues. * tag 'thunderbolt-for-v6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: thunderbolt: Fix NULL pointer dereference in tb_port_update_credits()
2 parents d206a76 + d3d17e2 commit 3c4a311

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/thunderbolt/switch.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,9 @@ int tb_port_update_credits(struct tb_port *port)
12491249
ret = tb_port_do_update_credits(port);
12501250
if (ret)
12511251
return ret;
1252+
1253+
if (!port->dual_link_port)
1254+
return 0;
12521255
return tb_port_do_update_credits(port->dual_link_port);
12531256
}
12541257

0 commit comments

Comments
 (0)