summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-29 15:19:39 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-07-29 15:19:39 +0200
commitd29809b8eb12d291d7b507fdaaa5e44707641685 (patch)
treea63b3feb1586911187df7b6ef60d692f7a2fa08e /drivers
parent559ed40752dc63e68f9b9ad301b20e6a3fe5cf21 (diff)
parent71b65445f0ed04c2afe3660f829779fddb2890c1 (diff)
Merge branches 'pm-cpufreq' and 'acpi-pm'
* pm-cpufreq: cpufreq: Avoid attempts to create duplicate symbolic links intel_pstate: Add get_scaling cpu_defaults param to Knights Landing * acpi-pm: ACPI / PM: Use target_state to set the device power state
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/device_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 717afcdb5f4a..88dbbb115285 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -231,7 +231,7 @@ int acpi_device_set_power(struct acpi_device *device, int state)
dev_warn(&device->dev, "Failed to change power state to %s\n",
acpi_power_state_string(state));
} else {
- device->power.state = state;
+ device->power.state = target_state;
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Device [%s] transitioned to %s\n",
device->pnp.bus_id,