diff options
| author | Alexander Chiang <achiang@hp.com> | 2009-06-10 21:55:45 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-06-18 05:22:16 +0200 |
| commit | 97719a8726fe8d3ea12a85fbf4f514a915ba30ec (patch) | |
| tree | 3cb4ef4498be5d22cddd93601e490f5be5e14a8c /drivers/acpi/pci_bind.c | |
| parent | ACPI: simplify acpi_pci_irq_del_prt() API (diff) | |
| download | linux-97719a8726fe8d3ea12a85fbf4f514a915ba30ec.tar.xz linux-97719a8726fe8d3ea12a85fbf4f514a915ba30ec.zip | |
ACPI: acpi_pci_unbind should clean up properly after acpi_pci_bind
In acpi_pci_bind, we set device->ops.bind and device->ops.unbind, but
never clear them out.
Signed-off-by: Alex Chiang <achiang@hp.com>
Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/pci_bind.c')
| -rw-r--r-- | drivers/acpi/pci_bind.c | 11 |
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; } |