diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-19 01:05:46 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-19 01:05:46 +0100 |
| commit | 614d7426ec109501e9e77be66963caf3041e566c (patch) | |
| tree | 790b6699c381ba1e42b3bc0383047b225662fb08 /drivers/acpi/pci_root.c | |
| parent | f86e7bc9683ee6dbde56d4bd4fda65f085b814d0 (diff) | |
| parent | 883461679ad1ed6e09135adf8c02bb98d7962623 (diff) | |
| download | blackbird-op-linux-614d7426ec109501e9e77be66963caf3041e566c.tar.gz blackbird-op-linux-614d7426ec109501e9e77be66963caf3041e566c.zip | |
Merge branch 'acpi-hotplug'
* acpi-hotplug:
ACPI / scan: Set flags.match_driver in acpi_bus_scan_fixed()
ACPI / PCI root: Clear driver_data before failing enumeration
ACPI / hotplug: Fix PCI host bridge hot removal
ACPI / hotplug: Fix acpi_bus_get_device() return value check
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -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 56f05869b08d..0703bff5e60e 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -575,6 +575,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; } |
