Merge back earlier ACPI PM material for v4.3.

[deliverable/linux.git] / drivers / acpi / device_pm.c

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 08dc3ec7e89272ef4258c7148c39ecceb3fb1e22..337e8118836dd76bb30027ba9c90e4ff919fb0e7 100644 (file)
--- 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,