From: Rafael J. Wysocki Date: Fri, 15 Oct 2021 17:04:26 +0000 (+0200) Subject: ACPI: PM: Turn off wakeup power resources on _DSW/_PSW errors X-Git-Tag: v6.1-rc5~2753^2~1^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9a8f827f9e81dc8506d3283d166cd6efe822302;p=platform%2Fkernel%2Flinux-starfive.git 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 --- diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index ba6aaf7..1122561 100644 --- 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);