Merge tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[platform/kernel/linux-rpi.git] / drivers / thunderbolt / tb.c

diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index e1c0cfe..4628458 100644 (file)
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -200,10 +200,10 @@ static void tb_discover_tunnels(struct tb *tb)
        }
 }
 
-static int tb_port_configure_xdomain(struct tb_port *port)
+static int tb_port_configure_xdomain(struct tb_port *port, struct tb_xdomain *xd)
 {
        if (tb_switch_is_usb4(port->sw))
-               return usb4_port_configure_xdomain(port);
+               return usb4_port_configure_xdomain(port, xd);
        return tb_lc_configure_xdomain(port);
 }
 
@@ -238,7 +238,7 @@ static void tb_scan_xdomain(struct tb_port *port)
                              NULL);
        if (xd) {
                tb_port_at(route, sw)->xdomain = xd;
-               tb_port_configure_xdomain(port);
+               tb_port_configure_xdomain(port, xd);
                tb_xdomain_add(xd);
        }
 }
@@ -1547,7 +1547,7 @@ static void tb_restore_children(struct tb_switch *sw)
 
                        tb_restore_children(port->remote->sw);
                } else if (port->xdomain) {
-                       tb_port_configure_xdomain(port);
+                       tb_port_configure_xdomain(port, port->xdomain);
                }
        }
 }