ACPI: PM: Turn off wakeup power resources on _DSW/_PSW errors

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 <[email protected]>

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index ba6aaf7224a1d5b329ff0d9c6971e31eaf4ede4d..112256154880e016e1043243ce496b441ceea17a 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -731,8 +731,10 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state)
         * 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);