diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-23 22:15:43 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-23 22:15:43 (GMT) |
| commit | 4383822020c54c21eb2eb939a3233b44a51e8ca0 (patch) | |
| tree | 3bfc91336f7310e3b70058db85e28833067bc661 /drivers/acpi/scan.c | |
| parent | bf900afba96bf34038bf2c944bbcad7424a40051 (diff) | |
| parent | b5d667eb392ed901fc7ae76869c7a130559e193c (diff) | |
| download | linux-fsl-qoriq-4383822020c54c21eb2eb939a3233b44a51e8ca0.tar.xz | |
Merge branch 'acpi-pm' into fixes
* acpi-pm:
ACPI / PM: Take unusual configurations of power resources into account
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index daee749..1c6104c 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1002,7 +1002,14 @@ static int acpi_bus_extract_wakeup_device_power_package(acpi_handle handle, if (!list_empty(&wakeup->resources)) { int sleep_state; - sleep_state = acpi_power_min_system_level(&wakeup->resources); + err = acpi_power_wakeup_list_init(&wakeup->resources, + &sleep_state); + if (err) { + acpi_handle_warn(handle, "Retrieving current states " + "of wakeup power resources failed\n"); + acpi_power_resources_list_free(&wakeup->resources); + goto out; + } if (sleep_state < wakeup->sleep_state) { acpi_handle_warn(handle, "Overriding _PRW sleep state " "(S%d) by S%d from power resources\n", |