Skip to content

Commit 85850af

Browse files
superm1rafaeljw
authored andcommitted
PM: hibernate: Allow hybrid sleep to work with s2idle
Hybrid sleep is currently hardcoded to only operate with S3 even on systems that might not support it. Instead of assuming this mode is what the user wants to use, for hybrid sleep follow the setting of `mem_sleep_current` which will respect mem_sleep_default kernel command line and policy decisions made by the presence of the FADT low power idle bit. Fixes: 81d45bd ("PM / hibernate: Untangle power_down()") Reported-and-tested-by: kolAflash <[email protected]> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216574 Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 247f34f commit 85850af

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/power/hibernate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ static void power_down(void)
645645
int error;
646646

647647
if (hibernation_mode == HIBERNATION_SUSPEND) {
648-
error = suspend_devices_and_enter(PM_SUSPEND_MEM);
648+
error = suspend_devices_and_enter(mem_sleep_current);
649649
if (error) {
650650
hibernation_mode = hibernation_ops ?
651651
HIBERNATION_PLATFORM :

0 commit comments

Comments
 (0)