Merge tag 'trace-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[karo-tx-linux.git] / drivers / pci / search.c

diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 33e0f033a48e7e2f6097b13d4425d8d17b1cabb7..4c6044ad7368acbe617fbd6bd90bfb359f29032a 100644 (file)
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -60,6 +60,10 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
 
                tmp = bus->self;
 
+               /* stop at bridge where translation unit is associated */
+               if (tmp->dev_flags & PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT)
+                       return ret;
+
                /*
                 * PCIe-to-PCI/X bridges alias transactions from downstream
                 * devices using the subordinate bus number (PCI Express to