---

yaml --- r: 36080 b: refs/heads/master c: 0dad351 h: refs/heads/master v: v3
git-mirror · Sep 27, 2006 · 2e8fc90 · 2e8fc90
1 parent 8d3a41e
commit 2e8fc90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24f8aa9b464b73e0553f092b747770940ee0ea54
+refs/heads/master: 0dad3510ee82bcf8a380b81a2184a664a911ef9c
diff --git a/trunk/drivers/pci/hotplug/acpiphp_glue.c b/trunk/drivers/pci/hotplug/acpiphp_glue.c
@@ -1129,6 +1129,9 @@ static int disable_device(struct acpiphp_slot *slot)
 			func->bridge = NULL;
 		}
 
+		if (func->pci_dev)
+			pci_stop_bus_device(func->pci_dev);
+
 		acpiphp_bus_trim(func->handle);
 		/* try to remove anyway.
 		 * acpiphp_bus_add might have been failed */