kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

thunderbolt: Fix for v5.8-rc4

Browse source 
This includes a single patch that corrects path indices used in USB3
 tunnel discovery.
 -----BEGIN PGP SIGNATURE-----
 
 iQJUBAABCgA+FiEEVTdhRGBbNzLrSUBaAP2fSd+ZWKAFAl78X98gHG1pa2Eud2Vz
 dGVyYmVyZ0BsaW51eC5pbnRlbC5jb20ACgkQAP2fSd+ZWKALSg/+KeIBFoetMKbA
 5Z1qddGTgCtmZGNk4hETyKX76OLecBkpC5y0EvfjMyE9DVKmvArTfq66Lw8mzw8N
 2jUTXeQRJ/fV6rqRkp2CIOCM5nIsmmueQEPS6UTMf7ujVGdu2QflsWCuaqjGYWz6
 CzesYfh0AnBGjHHe1Qz6N7CdeRCwCZ3du6kT0HBMCi2UlOpKrlEGeoo6HE+vr6yH
 eB8SBamI/sI0NG84KYTsrELOvoCDDlzvkx6BHPqc3tE5xBpOdRnHvPZqLBp0HAqz
 05x1J2FZeyBqxlnJ0iy7+CZXxDUUvNlaaI2XXfOBHVU21wAIOqoUHV9qdN8JPVFc
 1MIEgwSwRNtCobENv0I7BNkr1iA5pnnvAIP+V9I+2RaEtoSzv80n+IAG1YKmAcMm
 n1zqgnzh7nQJ7iKmlcxUeCxsHlrdbOAOJwBcnwdqhwy4NCatofj0+pkIodIf/w6f
 OAznH+5b++2eKhF2kKaVFPEH6PKqqxHwYq6kG8A3gUH+NaYSdIe8UwRJPIBVk9FW
 ACjjg6xZ1tUEtgaDZMoHgq8MJ2Qnew0IlxRUOHs8ySzsSQ8rf2RYuTvLVT2+AfFS
 kE694PR0sLWEhCvB5KIn3Szj0DNYNDGIbt8Nwz8APwstCmjhKu0vcl9w169tYdv2
 Nm9QzuX8Y+wG8uPVE0cXs5QioZduSNQ=
 =VTy1
 -----END PGP SIGNATURE-----

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

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
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.
*/
path = tb_path_discover(down, TB_USB3_HOPID, NULL, -1,
&tunnel->dst_port, "USB3 Up");
&tunnel->dst_port, "USB3 Down");
if (!path) {
/* Just disable the downstream port */
tb_usb3_port_enable(down, false);
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;
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 */
if (!tb_port_is_usb3_up(tunnel->dst_port)) {
tb_port_warn(tunnel->dst_port,