Merge branch 'acpi-pci-hotplug' into acpi-hotplug

8ff47aaf · Rafael J. Wysocki · 2c22e652 · f26ca1d6 · 8ff47aaf
Commit 8ff47aaf authored Nov 28, 2013 by Rafael J. Wysocki
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

drivers/pci/hotplug/acpiphp_glue.c drivers/pci/hotplug/acpiphp_glue.c +3 -1

No files found.
--- 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;
 	}