diff options
| author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2020-03-11 16:12:50 +0300 |
|---|---|---|
| committer | Mika Westerberg <mika.westerberg@linux.intel.com> | 2020-06-22 19:58:20 +0300 |
| commit | 9cac51a049dbbca0b078bb9cffa7a8d928cf0f06 (patch) | |
| tree | f00a7964561c295151282cf9bfc7852fb1251f9b /drivers/thunderbolt | |
| parent | 77cfa40fcdea9f75255a9785d345fa25e4a3ad0b (diff) | |
| download | linux-stable-9cac51a049dbbca0b078bb9cffa7a8d928cf0f06.tar.gz linux-stable-9cac51a049dbbca0b078bb9cffa7a8d928cf0f06.tar.bz2 linux-stable-9cac51a049dbbca0b078bb9cffa7a8d928cf0f06.zip | |
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>
Diffstat (limited to 'drivers/thunderbolt')
| -rw-r--r-- | drivers/thunderbolt/tb.c | 2 | ||||
| -rw-r--r-- | drivers/thunderbolt/usb4.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c index 82f62a023a4b..9dbdb11685fa 100644 --- 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 375a8c459201..dd1c0498a8ee 100644 --- 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++; |