diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-14 00:54:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-19 01:04:01 +0100 |
| commit | f516bde5122422889398d10e8e746d18860bd42e (patch) | |
| tree | 787b3c0925924649bf06c6b907a871b3355937ae | |
| parent | ACPI / hotplug: Fix PCI host bridge hot removal (diff) | |
| download | linux-f516bde5122422889398d10e8e746d18860bd42e.tar.xz linux-f516bde5122422889398d10e8e746d18860bd42e.zip | |
ACPI / PCI root: Clear driver_data before failing enumeration
If a PCI host bridge cannot be enumerated due to an error in
pci_acpi_scan_root(), its ACPI device object's driver_data field
has to be cleared by acpi_pci_root_add() before freeing the
object pointed to by that field, or some later acpi_pci_find_root()
checks that should fail may succeed and cause quite a bit of
confusion to ensue.
Fix acpi_pci_root_add() to clear device->driver_data before
returning an error code as appropriate.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
| -rw-r--r-- | drivers/acpi/pci_root.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 417876bce854..b5cb729328a4 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -525,6 +525,7 @@ static int acpi_pci_root_add(struct acpi_device *device, dev_err(&device->dev, "Bus %04x:%02x not present in PCI namespace\n", root->segment, (unsigned int)root->secondary.start); + device->driver_data = NULL; result = -ENODEV; goto end; } |