PCI/ACPI: Delete host bridge _PRT during hot remove path
authorYinghai Lu <yinghai@kernel.org>
Tue, 30 Oct 2012 20:31:48 +0000 (14:31 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 3 Nov 2012 22:26:37 +0000 (16:26 -0600)
Corresponding to add path.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/pci_root.c

index aed09537861a319d99265b04e64142a3bcb39903..a27cbb572fe1c3ab4e0bd0c24668668204dcee8e 100644 (file)
@@ -664,6 +664,8 @@ static int acpi_pci_root_start(struct acpi_device *device)
 
 static int acpi_pci_root_remove(struct acpi_device *device, int type)
 {
+       acpi_status status;
+       acpi_handle handle;
        struct acpi_pci_root *root = acpi_driver_data(device);
        struct acpi_pci_driver *driver;
 
@@ -678,6 +680,10 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type)
        device_set_run_wake(root->bus->bridge, false);
        pci_acpi_remove_bus_pm_notifier(device);
 
+       status = acpi_get_handle(device->handle, METHOD_NAME__PRT, &handle);
+       if (ACPI_SUCCESS(status))
+               acpi_pci_irq_del_prt(root->bus);
+
        pci_remove_root_bus(root->bus);
 
        mutex_lock(&acpi_pci_root_lock);