From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 28 Nov 2013 22:56:32 +0000 (+0100)
Subject: Merge branch 'acpi-pci-hotplug' into acpi-hotplug
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=8ff47aafb25cc80417118e4968d4e7ca3f46c3ee;hp=-c;p=~andy%2Flinux

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

8ff47aafb25cc80417118e4968d4e7ca3f46c3ee
diff --combined drivers/pci/hotplug/acpiphp_glue.c
index 67be6bab753,438a4d09958..ec4ddae1fb5
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@@ -279,7 -279,9 +279,9 @@@ static acpi_status register_slot(acpi_h
  
  	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;
  	}
  
@@@ -489,7 -491,7 +491,7 @@@ static void acpiphp_bus_add(acpi_handl
  
  	acpi_bus_scan(handle);
  	acpi_bus_get_device(handle, &adev);
 -	if (adev)
 +	if (acpi_device_enumerated(adev))
  		acpi_device_set_power(adev, ACPI_STATE_D0);
  }