Commit 755f1fed authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pm-5.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "Fix recent regression affecting ACPI device power management"

* tag 'pm-5.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: PM: Fix regression in acpi_device_set_power()
parents 75cdf416 42787ed7
...@@ -232,13 +232,15 @@ int acpi_device_set_power(struct acpi_device *device, int state) ...@@ -232,13 +232,15 @@ int acpi_device_set_power(struct acpi_device *device, int state)
if (device->power.flags.power_resources) if (device->power.flags.power_resources)
result = acpi_power_transition(device, target_state); result = acpi_power_transition(device, target_state);
} else { } else {
int cur_state = device->power.state;
if (device->power.flags.power_resources) { if (device->power.flags.power_resources) {
result = acpi_power_transition(device, ACPI_STATE_D0); result = acpi_power_transition(device, ACPI_STATE_D0);
if (result) if (result)
goto end; goto end;
} }
if (device->power.state == ACPI_STATE_D0) { if (cur_state == ACPI_STATE_D0) {
int psc; int psc;
/* Nothing to do here if _PSC is not present. */ /* Nothing to do here if _PSC is not present. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment