diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-10-30 16:31:26 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-03 18:20:30 -0400 |
commit | e164f658f209b85566732bd85c62009237be0909 (patch) | |
tree | 1e8d6dcb7c5a5755a97b35ab82edbdda78a25404 /drivers/pci/probe.c | |
parent | a5213a3194f73cd29c68128d1540ce81f03ba7b9 (diff) |
PCI: Move out pci_enable_bridges out of assign_unsigned_bus_res
So could use assign_unassigned_bus_res pci root bus add
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 65f62e353719..59cf1ba34936 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -1905,6 +1905,7 @@ unsigned int __ref pci_rescan_bus(struct pci_bus *bus) | |||
1905 | 1905 | ||
1906 | max = pci_scan_child_bus(bus); | 1906 | max = pci_scan_child_bus(bus); |
1907 | pci_assign_unassigned_bus_resources(bus); | 1907 | pci_assign_unassigned_bus_resources(bus); |
1908 | pci_enable_bridges(bus); | ||
1908 | pci_bus_add_devices(bus); | 1909 | pci_bus_add_devices(bus); |
1909 | 1910 | ||
1910 | return max; | 1911 | return max; |