ACPI / PM: Handle missing _PSC in acpi_bus_update_power()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 3 Feb 2013 13:57:32 +0000 (14:57 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 3 Feb 2013 13:57:32 +0000 (14:57 +0100)
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>
drivers/acpi/device_pm.c

index 164d609d7c9eb81216e9c3504686f25f9c6b76c1..dd314ef9bff144759154cb9e27eb8bc5ade63213 100644 (file)
@@ -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;