1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 62cb383222f8..a205769f1d00 100644
--- a/drivers/acpi/pci_bind.c
+++ b/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;
 }