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/scan.c | |
| parent | abe5430e9d5314190ca571b3bfc0c42000634378 (diff) | |
| parent | 593298e68a3a53bd2fe942244250dfef4d68d477 (diff) | |
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/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index d5993e339a26..a8a55d4143f2 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1409,8 +1409,8 @@ static void acpi_bus_get_power_flags(struct acpi_device *device) /* Set defaults for D0 and D3 states (always valid) */ device->power.states[ACPI_STATE_D0].flags.valid = 1; device->power.states[ACPI_STATE_D0].power = 100; - device->power.states[ACPI_STATE_D3].flags.valid = 1; - device->power.states[ACPI_STATE_D3].power = 0; + device->power.states[ACPI_STATE_D3_COLD].flags.valid = 1; + device->power.states[ACPI_STATE_D3_COLD].power = 0; /* Set D3cold's explicit_set flag if _PS3 exists. */ if (device->power.states[ACPI_STATE_D3_HOT].flags.explicit_set) |