diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-28 23:56:32 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-28 23:56:32 +0100 |
commit | 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (patch) | |
tree | f63632f103c46638f9decbca6f7a2889c2764e39 /drivers/pci | |
parent | ACPI / scan: Use direct recurrence for device hierarchy walks (diff) | |
parent | ACPI / PCI / hotplug: Avoid warning when _ADR not present (diff) | |
download | linux-8ff47aafb25cc80417118e4968d4e7ca3f46c3ee.tar.xz linux-8ff47aafb25cc80417118e4968d4e7ca3f46c3ee.zip |
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 67be6bab7535..ec4ddae1fb54 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -279,7 +279,9 @@ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *data, status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr); if (ACPI_FAILURE(status)) { - acpi_handle_warn(handle, "can't evaluate _ADR (%#x)\n", status); + if (status != AE_NOT_FOUND) + acpi_handle_warn(handle, + "can't evaluate _ADR (%#x)\n", status); return AE_OK; } |