diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-02-25 13:54:23 -0800 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-27 12:17:16 -0800 |
commit | f6330c3178112a7b7f18e7f51f1cbb89fa1174c7 (patch) | |
tree | c19c236c02d093adc9b02b537610b6fc36b9c0e7 /drivers/pci | |
parent | 6b22cf3f35fd332e4cc2c1b27056920b3643667a (diff) | |
download | blackbird-op-linux-f6330c3178112a7b7f18e7f51f1cbb89fa1174c7.tar.gz blackbird-op-linux-f6330c3178112a7b7f18e7f51f1cbb89fa1174c7.zip |
PCI: make acpihp use __pci_remove_bus_device instead
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index fdc34b599e7b..806c44fa645a 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -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); } } |