---

yaml --- r: 154149 b: refs/heads/master c: 97719a8 h: refs/heads/master i: 154147: e00ca72 v: v3
git-mirror · Jun 18, 2009 · 4a98348 · 4a98348
1 parent 9b07f85
commit 4a98348
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9efae3688addb15994c9ad9761dada6f988bc14
+refs/heads/master: 97719a8726fe8d3ea12a85fbf4f514a915ba30ec
diff --git a/trunk/drivers/acpi/pci_bind.c b/trunk/drivers/acpi/pci_bind.c
@@ -109,12 +109,15 @@ static int acpi_pci_unbind(struct acpi_device *device)
 	struct pci_dev *dev;
 
 	dev = acpi_get_pci_dev(device->handle);
-	if (!dev)
-		return 0;
+	if (!dev || !dev->subordinate)
+		goto out;
 
-	if (dev->subordinate)
-		acpi_pci_irq_del_prt(dev->subordinate);
+	acpi_pci_irq_del_prt(dev->subordinate);
+
+	device->ops.bind = NULL;
+	device->ops.unbind = NULL;
 
+out:
 	pci_dev_put(dev);
 	return 0;
 }