diff options
| author | Joerg Roedel <jroedel@suse.de> | 2020-05-13 12:01:33 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-05-13 12:01:33 +0200 |
| commit | ec9b40cffdb68c4ea1ebdcd1648ed6ce15c4449e (patch) | |
| tree | 27b964f4377bf1ac712c118a6a3fb945476c7da6 /drivers/acpi/device_pm.c | |
| parent | 3a0ce12e3b8e3cb7d54569a42aec743cc93f4f0d (diff) | |
| parent | 0e698dfa282211e414076f9dc7e83c1c288314fd (diff) | |
| download | linux-ec9b40cffdb68c4ea1ebdcd1648ed6ce15c4449e.tar.gz linux-ec9b40cffdb68c4ea1ebdcd1648ed6ce15c4449e.tar.bz2 linux-ec9b40cffdb68c4ea1ebdcd1648ed6ce15c4449e.zip | |
Merge tag 'v5.7-rc4' into core
Linux 5.7-rc4
Diffstat (limited to 'drivers/acpi/device_pm.c')
| -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; |