PCI: make acpihp use __pci_remove_bus_device instead
authorYinghai Lu <yinghai@kernel.org>
Sat, 25 Feb 2012 21:54:23 +0000 (13:54 -0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 27 Feb 2012 20:17:16 +0000 (12:17 -0800)
pci_stop_bus_device gets called before in the same loop.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/hotplug/acpiphp_glue.c

index fdc34b5..806c44f 100644 (file)
@@ -910,7 +910,7 @@ static int disable_device(struct acpiphp_slot *slot)
                                disable_bridges(pdev->subordinate);
                                pci_disable_device(pdev);
                        }
-                       pci_stop_and_remove_bus_device(pdev);
+                       __pci_remove_bus_device(pdev);
                        pci_dev_put(pdev);
                }
        }