| Message ID | 74b1e7106699a677a2a6cb8e7700fd7770d346d8.1458641423.git.lukas@wunner.de (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index fbfcce3..2a8b596 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -748,6 +748,7 @@ static int acpi_hibernation_enter(void) static void acpi_hibernation_leave(void) { + pm_set_resume_via_firmware(); /* * If ACPI is not enabled by the BIOS and the boot kernel, we need to * enable it here.
Commit 58a1fbbb2ee8 ("PM / PCI / ACPI: Kick devices that might have been reset by firmware") added a runtime resume for devices that were runtime suspended when the system entered suspend-to-RAM. Briefly, the motivation was to ensure that devices did not remain in a reset-power-on state after resume, potentially preventing deep SoC-wide low-power states from being entered on idle. Currently we're not doing the same when leaving suspend-to-disk and this asymmetry is a problem if drivers rely on the automatic resume triggered by pm_complete_with_resume_check(). Fix it. Fixes: 58a1fbbb2ee8 ("PM / PCI / ACPI: Kick devices that might have been reset by firmware") Signed-off-by: Lukas Wunner <lukas@wunner.de> --- drivers/acpi/sleep.c | 1 + 1 file changed, 1 insertion(+)