@@ -485,11 +485,11 @@ int acpi_s2idle_prepare_late(void)
485
485
ACPI_LPS0_ENTRY ,
486
486
lps0_dsm_func_mask , lps0_dsm_guid );
487
487
if (lps0_dsm_func_mask_microsoft > 0 ) {
488
- acpi_sleep_run_lps0_dsm (ACPI_LPS0_ENTRY ,
489
- lps0_dsm_func_mask_microsoft , lps0_dsm_guid_microsoft );
490
488
/* modern standby entry */
491
489
acpi_sleep_run_lps0_dsm (ACPI_LPS0_MS_ENTRY ,
492
490
lps0_dsm_func_mask_microsoft , lps0_dsm_guid_microsoft );
491
+ acpi_sleep_run_lps0_dsm (ACPI_LPS0_ENTRY ,
492
+ lps0_dsm_func_mask_microsoft , lps0_dsm_guid_microsoft );
493
493
}
494
494
495
495
list_for_each_entry (handler , & lps0_s2idle_devops_head , list_node ) {
@@ -524,11 +524,6 @@ void acpi_s2idle_restore_early(void)
524
524
if (handler -> restore )
525
525
handler -> restore ();
526
526
527
- /* Modern standby exit */
528
- if (lps0_dsm_func_mask_microsoft > 0 )
529
- acpi_sleep_run_lps0_dsm (ACPI_LPS0_MS_EXIT ,
530
- lps0_dsm_func_mask_microsoft , lps0_dsm_guid_microsoft );
531
-
532
527
/* LPS0 exit */
533
528
if (lps0_dsm_func_mask > 0 )
534
529
acpi_sleep_run_lps0_dsm (acpi_s2idle_vendor_amd () ?
@@ -539,6 +534,11 @@ void acpi_s2idle_restore_early(void)
539
534
acpi_sleep_run_lps0_dsm (ACPI_LPS0_EXIT ,
540
535
lps0_dsm_func_mask_microsoft , lps0_dsm_guid_microsoft );
541
536
537
+ /* Modern standby exit */
538
+ if (lps0_dsm_func_mask_microsoft > 0 )
539
+ acpi_sleep_run_lps0_dsm (ACPI_LPS0_MS_EXIT ,
540
+ lps0_dsm_func_mask_microsoft , lps0_dsm_guid_microsoft );
541
+
542
542
/* Screen on */
543
543
if (lps0_dsm_func_mask_microsoft > 0 )
544
544
acpi_sleep_run_lps0_dsm (ACPI_LPS0_SCREEN_ON ,
0 commit comments