Merge tag 'thunderbolt-fix-for-v5.8-rc4' of... (3660d0b8) · Commits · 戴 / test

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

drivers/thunderbolt/tunnel.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -913,21 +913,21 @@ 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]);
		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 Down");
		"USB3 Up");
		if (!path)
		goto err_deactivate;
		tunnel->paths[TB_USB3_PATH_DOWN] = path;
		tb_usb3_init_path(tunnel->paths[TB_USB3_PATH_DOWN]);
		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)) {