From: Yinghai Lu <yinghai@kernel.org>
Date: Sat, 25 Feb 2012 21:54:23 +0000 (-0800)
Subject: PCI: make acpihp use __pci_remove_bus_device instead
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f6330c3178112a7b7f18e7f51f1cbb89fa1174c7;p=linux-beck.git

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>
---

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);
 		}
 	}