diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-30 14:34:00 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-30 14:34:00 +0200 |
commit | 2c7d132a589077b31493b3ea82ac83b1f72c93e1 (patch) | |
tree | 4f7f9c4972fe48d3cb5859404d645573a2346ba3 /drivers/acpi/device_pm.c | |
parent | Linux 3.11-rc3 (diff) | |
download | linux-2c7d132a589077b31493b3ea82ac83b1f72c93e1.tar.xz linux-2c7d132a589077b31493b3ea82ac83b1f72c93e1.zip |
ACPI / PM: Only set power states of devices that are power manageable
Make acpi_device_set_power() check if the given device is power
manageable before checking if the given power state is valid for that
device. Otherwise it will print that "Device does not support" that
power state into the kernel log, which may not make sense for some
power states (D0 and D3cold are supported by all devices by
definition).
Tested-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/device_pm.c')
-rw-r--r-- | drivers/acpi/device_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 4ab807dc8518..63324b873636 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -159,7 +159,8 @@ int acpi_device_set_power(struct acpi_device *device, int state) int result = 0; bool cut_power = false; - if (!device || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD)) + if (!device || !device->flags.power_manageable + || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD)) return -EINVAL; /* Make sure this is a valid target state */ |