aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/pci_root.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 1dd6f6c85874..eb09053c0fce 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -536,11 +536,10 @@ static int acpi_pci_root_add(struct acpi_device *device,
536 if (system_state != SYSTEM_BOOTING) { 536 if (system_state != SYSTEM_BOOTING) {
537 pcibios_resource_survey_bus(root->bus); 537 pcibios_resource_survey_bus(root->bus);
538 pci_assign_unassigned_bus_resources(root->bus); 538 pci_assign_unassigned_bus_resources(root->bus);
539 }
540 539
541 /* need to after hot-added ioapic is registered */ 540 /* need to after hot-added ioapic is registered */
542 if (system_state != SYSTEM_BOOTING)
543 pci_enable_bridges(root->bus); 541 pci_enable_bridges(root->bus);
542 }
544 543
545 pci_bus_add_devices(root->bus); 544 pci_bus_add_devices(root->bus);
546 return 1; 545 return 1;