In acpi_pci_bind, we add _PRT information for non-bridge devices, but
we never delete that information in acpi_pci_unbind.
We also set device->ops.bind and device->ops.unbind, but never clear
them out.
Let's make acpi_pci_unbind clean up what we did in acpi_pci_bind.
Cc: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
Signed-off-by: Alex Chiang <achiang@xxxxxx>
---
drivers/acpi/pci_bind.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 9185b54..c507e37 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -120,14 +120,21 @@ EXPORT_SYMBOL_GPL(acpi_get_pci_dev);
static int acpi_pci_unbind(struct acpi_device *device)
{
+ struct pci_bus *bus;
struct pci_dev *dev;
dev = acpi_get_pci_dev(device->handle);
if (!dev)
return 0;
- if (dev->subordinate)
- acpi_pci_irq_del_prt(dev->subordinate);
+ if (dev->subordinate) {
+ bus = dev->subordinate;
+ device->ops.bind = NULL;
+ device->ops.unbind = NULL;
+ } else
+ bus = dev->bus;
+
+ acpi_pci_irq_del_prt(bus);
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
