From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 3 Feb 2013 13:57:32 +0000 (+0100)
Subject: ACPI / PM: Handle missing _PSC in acpi_bus_update_power()
X-Git-Tag: v3.9-rc1~146^2~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=511d5c4212948fe55035b8fed61ac0e125af5a05;p=thirdparty%2Flinux.git

ACPI / PM: Handle missing _PSC in acpi_bus_update_power()

If _PS0 is defined for an ACPI device node, but _PSC isn't and
the device node doesn't use power resources for power management,
acpi_bus_update_power() will fail to update the power state of it,
because acpi_device_get_power() returns ACPI_STATE_UNKNOWN in that
case.

To handle that situation make acpi_bus_update_power() follow
acpi_bus_init_power() and try to force the given device node into
power state D0.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 164d609d7c9eb..dd314ef9bff14 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -355,6 +355,9 @@ int acpi_bus_update_power(acpi_handle handle, int *state_p)
 	if (result)
 		return result;
 
+	if (state == ACPI_STATE_UNKNOWN)
+		state = ACPI_STATE_D0;
+
 	result = acpi_device_set_power(device, state);
 	if (!result && state_p)
 		*state_p = state;