diff mbox series

[v1,3/3] ACPI: PM: Turn off wakeup power resources on _DSW/_PSW errors

Message ID 2795050.e9J7NaK4W3@kreacher
State New
Headers show
Series ACPI: PM: Address issues related to managing wakeup power resources | expand

Commit Message

Rafael J. Wysocki Oct. 15, 2021, 5:04 p.m. UTC 
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

If acpi_device_sleep_wake() called by acpi_enable_wakeup_device_power()
returns an error which means that the evaluation of either _DWS or
_PSW has failed, turn off all of the device's wakeup power resources
to be consistent with the clearing of dev->wakeup.prepare_count.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/acpi/power.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

Index: linux-pm/drivers/acpi/power.c
===================================================================
--- linux-pm.orig/drivers/acpi/power.c
+++ linux-pm/drivers/acpi/power.c
@@ -731,8 +731,10 @@  int acpi_enable_wakeup_device_power(stru
 	 * put into arbitrary power state afterward.
 	 */
 	err = acpi_device_sleep_wake(dev, 1, sleep_state, 3);
-	if (err)
+	if (err) {
+		acpi_power_off_list(&dev->wakeup.resources);
 		dev->wakeup.prepare_count = 0;
+	}
 
  out:
 	mutex_unlock(&acpi_device_lock);