1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index c6bcb8c719d8..68a5f712cd19 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -112,10 +112,10 @@ get_root_bridge_busnr_callback(struct acpi_resource *resource, void *data)
         if (ACPI_FAILURE(status))
                 return AE_OK;
 
-        if ((address.address_length > 0) &&
+        if ((address.address.address_length > 0) &&
             (address.resource_type == ACPI_BUS_NUMBER_RANGE)) {
-                res->start = address.minimum;
-                res->end = address.minimum + address.address_length - 1;
+                res->start = address.address.minimum;
+                res->end = address.address.minimum + address.address.address_length - 1;
         }
 
         return AE_OK;
@@ -621,6 +621,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
         if (hotadd) {
                 pcibios_resource_survey_bus(root->bus);
                 pci_assign_unassigned_root_bus_resources(root->bus);
+                acpi_ioapic_add(root);
         }
 
         pci_lock_rescan_remove();
@@ -644,6 +645,8 @@ static void acpi_pci_root_remove(struct acpi_device *device)
 
         pci_stop_root_bus(root->bus);
 
+        WARN_ON(acpi_ioapic_remove(root));
+
         device_set_run_wake(root->bus->bridge, false);
         pci_acpi_remove_bus_pm_notifier(device);