summaryrefslogtreecommitdiff
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-27 03:28:17 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-27 03:28:17 +0400
commit0ad4c9a9848fdd46dc422160efd947489a98bbc1 (patch)
treeb9a0de74dd0725d8b705b7a18b0fb14632c423fe /drivers/acpi/power.c
parentabe5430e9d5314190ca571b3bfc0c42000634378 (diff)
parent593298e68a3a53bd2fe942244250dfef4d68d477 (diff)
downloadlinux-0ad4c9a9848fdd46dc422160efd947489a98bbc1.tar.xz
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.c2
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;
}