diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /drivers/acpi/device_pm.c | |
| parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
| parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'drivers/acpi/device_pm.c')
| -rw-r--r-- | drivers/acpi/device_pm.c | 2 |
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) | |||
| 231 | dev_warn(&device->dev, "Failed to change power state to %s\n", | 231 | dev_warn(&device->dev, "Failed to change power state to %s\n", |
| 232 | acpi_power_state_string(state)); | 232 | acpi_power_state_string(state)); |
| 233 | } else { | 233 | } else { |
| 234 | device->power.state = state; | 234 | device->power.state = target_state; |
| 235 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 235 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 236 | "Device [%s] transitioned to %s\n", | 236 | "Device [%s] transitioned to %s\n", |
| 237 | device->pnp.bus_id, | 237 | device->pnp.bus_id, |