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

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

drivers/acpi/device_pm.c

+3 −1
Original line number Diff line number Diff line
@@ -232,13 +232,15 @@ int acpi_device_set_power(struct acpi_device *device, int state) 
		if (device->power.flags.power_resources)

			result = acpi_power_transition(device, target_state);

	} else {

		int cur_state = device->power.state;



		if (device->power.flags.power_resources) {

			result = acpi_power_transition(device, ACPI_STATE_D0);

			if (result)

				goto end;

		}



		if (device->power.state == ACPI_STATE_D0) {

		if (cur_state == ACPI_STATE_D0) {

			int psc;



			/* Nothing to do here if _PSC is not present. */