diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-28 17:56:32 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-28 17:56:32 -0500 |
| commit | 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (patch) | |
| tree | f63632f103c46638f9decbca6f7a2889c2764e39 /drivers/pci | |
| parent | 2c22e6520ac87d8b12d4d9941e81d4119f2d903c (diff) | |
| parent | f26ca1d699e8b54a50d9faf82327d3c2072aaedd (diff) | |
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, | |||
| 279 | 279 | ||
| 280 | status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr); | 280 | status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr); |
| 281 | if (ACPI_FAILURE(status)) { | 281 | if (ACPI_FAILURE(status)) { |
| 282 | acpi_handle_warn(handle, "can't evaluate _ADR (%#x)\n", status); | 282 | if (status != AE_NOT_FOUND) |
| 283 | acpi_handle_warn(handle, | ||
| 284 | "can't evaluate _ADR (%#x)\n", status); | ||
| 283 | return AE_OK; | 285 | return AE_OK; |
| 284 | } | 286 | } |
| 285 | 287 | ||