diff options
| author | Kai-Heng Feng <kai.heng.feng@canonical.com> | 2020-04-21 15:55:16 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-04-27 10:33:40 +0200 |
| commit | a9b760b0266f563b4784f695bbd0e717610dc10a (patch) | |
| tree | e3fb0a16c01892f1aa82bf08abd07de204404db1 | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
| download | linux-stable-a9b760b0266f563b4784f695bbd0e717610dc10a.tar.gz linux-stable-a9b760b0266f563b4784f695bbd0e717610dc10a.tar.bz2 linux-stable-a9b760b0266f563b4784f695bbd0e717610dc10a.zip | |
PM: ACPI: Output correct message on target power state
Transitioned power state logged at the end of setting ACPI power.
However, D3cold won't be in the message because state can only be
D3hot at most.
Use target_state to corretly report when power state is D3cold.
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/device_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index b2263ec67b43..5832bc10aca8 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -273,13 +273,13 @@ int acpi_device_set_power(struct acpi_device *device, int state) end: if (result) { dev_warn(&device->dev, "Failed to change power state to %s\n", - acpi_power_state_string(state)); + acpi_power_state_string(target_state)); } else { device->power.state = target_state; ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] transitioned to %s\n", device->pnp.bus_id, - acpi_power_state_string(state))); + acpi_power_state_string(target_state))); } return result; |