thunderbolt: Make usb4_switch_map_pcie_down() also return enabled ports

Just for symmetry with the usb4_switch_map_usb3_down() make this one
also return ports that are enabled.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c
index 82f62a023a4b552173f91a418560c0d42e77ebb2..9dbdb11685fa87666d59e44a9a61202a8dced5e9 100644 (file)
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@ -520,7 +520,7 @@ static struct tb_port *tb_find_pcie_down(struct tb_switch *sw,
        if (down) {
                if (WARN_ON(!tb_port_is_pcie_down(down)))
                        goto out;
-               if (WARN_ON(tb_pci_port_is_enabled(down)))
+               if (tb_pci_port_is_enabled(down))
                        goto out;
 
                return down;

diff --git a/drivers/thunderbolt/usb4.c b/drivers/thunderbolt/usb4.c
index 375a8c459201239ff47f5f64573166a2b3a798c0..dd1c0498a8eee588955c5e0be69c6011681a3b76 100644 (file)
--- a/drivers/thunderbolt/usb4.c
+++ b/drivers/thunderbolt/usb4.c
@@ -728,7 +728,7 @@ struct tb_port *usb4_switch_map_pcie_down(struct tb_switch *sw,
                if (!tb_port_is_pcie_down(p))
                        continue;
 
-               if (pcie_idx == usb4_idx && !tb_pci_port_is_enabled(p))
+               if (pcie_idx == usb4_idx)
                        return p;
 
                pcie_idx++;