---

yaml --- r: 324205 b: refs/heads/master c: 34e5484 h: refs/heads/master i: 324203: d2515e0 v: v3
git-mirror · Aug 22, 2012 · b39621e · b39621e
1 parent b45d439
commit b39621e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57fd9a4df562e7d2105a01ff57b4cdaa236c28ce
+refs/heads/master: 34e548431a7a2e73121c4a452eb3d1b0659bd77f
diff --git a/trunk/drivers/pci/hotplug/acpiphp_glue.c b/trunk/drivers/pci/hotplug/acpiphp_glue.c
@@ -920,8 +920,7 @@ static int disable_device(struct acpiphp_slot *slot)
 	 * here.
 	 */
 	while ((pdev = dev_in_slot(slot))) {
-		pci_stop_bus_device(pdev);
-		__pci_remove_bus_device(pdev);
+		pci_stop_and_remove_bus_device(pdev);
 		pci_dev_put(pdev);
 	}