diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 01:28:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 01:28:17 +0200 |
| commit | 0ad4c9a9848fdd46dc422160efd947489a98bbc1 (patch) | |
| tree | b9a0de74dd0725d8b705b7a18b0fb14632c423fe /drivers/acpi/power.c | |
| parent | Merge branch 'acpi-pci-hotplug' (diff) | |
| parent | ACPI / PM: Add state information to error message in acpi_device_set_power() (diff) | |
| download | linux-dev-0ad4c9a9848fdd46dc422160efd947489a98bbc1.tar.xz linux-dev-0ad4c9a9848fdd46dc422160efd947489a98bbc1.zip | |
Merge branch 'acpi-pm'
* acpi-pm:
ACPI / PM: Add state information to error message in acpi_device_set_power()
ACPI / PM: Remove redundant power manageable check from acpi_bus_set_power()
ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere
ACPI / PM: Make messages in acpi_device_set_power() print device names
ACPI / PM: Only set power states of devices that are power manageable
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 1460c88a7c0e..0dbe5cdf3396 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -784,7 +784,7 @@ int acpi_power_get_inferred_state(struct acpi_device *device, int *state) } } - *state = ACPI_STATE_D3; + *state = ACPI_STATE_D3_COLD; return 0; } |