leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'thunderbolt-fix-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Browse Source 
Mika writes:

thunderbolt: Fix for v5.8-rc4

This includes a single patch that corrects path indices used in USB3
tunnel discovery.

* tag 'thunderbolt-fix-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix path indices used in USB3 tunnel discovery
This commit is contained in:
Greg Kroah-Hartman
2020-07-01 13:52:21 +02:00
parent 9ebcfadb06 8b94a4b923
commit 3660d0b838
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/thunderbolt/tunnel.c
View File

@@ -913,22 +913,22 @@ struct tb_tunnel *tb_tunnel_discover_usb3(struct tb *tb, struct tb_port *down)
* case. * case.
*/ */
path = tb_path_discover(down, TB_USB3_HOPID, NULL, -1, path = tb_path_discover(down, TB_USB3_HOPID, NULL, -1,
&tunnel->dst_port, "USB3 Up"); &tunnel->dst_port, "USB3 Down");
if (!path) { if (!path) {
/* Just disable the downstream port */ /* Just disable the downstream port */
tb_usb3_port_enable(down, false); tb_usb3_port_enable(down, false);
goto err_free; goto err_free;
} }
tunnel->paths[TB_USB3_PATH_UP] = path;
tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_UP]);
path = tb_path_discover(tunnel->dst_port, -1, down, TB_USB3_HOPID, NULL,
"USB3 Down");
if (!path)
goto err_deactivate;
tunnel->paths[TB_USB3_PATH_DOWN] = path; tunnel->paths[TB_USB3_PATH_DOWN] = path;
tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_DOWN]); tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_DOWN]);
path = tb_path_discover(tunnel->dst_port, -1, down, TB_USB3_HOPID, NULL,
"USB3 Up");
if (!path)
goto err_deactivate;
tunnel->paths[TB_USB3_PATH_UP] = path;
tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_UP]);
/* Validate that the tunnel is complete */ /* Validate that the tunnel is complete */
if (!tb_port_is_usb3_up(tunnel->dst_port)) { if (!tb_port_is_usb3_up(tunnel->dst_port)) {
tb_port_warn(tunnel->dst_port, tb_port_warn(tunnel->dst_port,