diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-03 17:57:32 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-03 17:57:32 +0400 |
| commit | 511d5c4212948fe55035b8fed61ac0e125af5a05 (patch) | |
| tree | 3b8b6a2d929aa8515f4de4e736f10626e747cdf0 | |
| parent | b3785492268f9f3cdaa9722facb84b266dcf8bf6 (diff) | |
| download | linux-511d5c4212948fe55035b8fed61ac0e125af5a05.tar.xz | |
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>
| -rw-r--r-- | drivers/acpi/device_pm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 164d609d7c9e..dd314ef9bff1 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; |