diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-08-01 20:23:25 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-08-01 20:23:25 +0300 |
| commit | c5cb85b2583755dcbc7321485947359f6951f75c (patch) | |
| tree | e3394d789579d58415bda1f8cec7d25078a3deaf /drivers/pci/probe.c | |
| parent | af8c34ce6ae32addda3788d54a7e340cad22516b (diff) | |
| parent | 0cb0786bac159ee4c983abab51093ef623849afa (diff) | |
| download | linux-c5cb85b2583755dcbc7321485947359f6951f75c.tar.xz | |
Merge branch 'pci/arm64-acpi' into next
* pci/arm64-acpi:
ARM64: PCI: Support ACPI-based PCI host controller
ARM64: PCI: Implement AML accessors for PCI_Config region
ARM64: PCI: ACPI support for legacy IRQs parsing and consolidation with DT code
ARM64: PCI: Add acpi_pci_bus_find_domain_nr()
PCI: Factor DT-specific pci_bus_find_domain_nr() code out
PCI: Refactor pci_bus_assign_domain_nr() for CONFIG_PCI_DOMAINS_GENERIC
PCI/ACPI: Add generic MCFG table handling
PCI/ACPI: Support I/O resources when parsing host bridge resources
PCI: Add pci_unmap_iospace() to unmap I/O resources
PCI: Add parent device field to ECAM struct pci_config_window
PCI: Move ecam.h to linux/include/pci-ecam.h
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8e3ef720997d..380d46dc9a70 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2127,7 +2127,9 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, b->sysdata = sysdata; b->ops = ops; b->number = b->busn_res.start = bus; - pci_bus_assign_domain_nr(b, parent); +#ifdef CONFIG_PCI_DOMAINS_GENERIC + b->domain_nr = pci_bus_find_domain_nr(b, parent); +#endif b2 = pci_find_bus(pci_domain_nr(b), bus); if (b2) { /* If we already got to this bus through a different bridge, ignore it */ |