Commit 0f09f4c4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-pm' 

* acpi-pm:
  ACPI: PM: s2idle: Invert Microsoft UUID entry and exit
parents 2bbfa0ad 4753b46e

drivers/acpi/x86/s2idle.c

+2 −2
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ int acpi_s2idle_prepare_late(void) 
	if (lps0_dsm_func_mask_microsoft > 0) {

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT,

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
@@ -479,7 +479,7 @@ void acpi_s2idle_restore_early(void) 
	if (lps0_dsm_func_mask_microsoft > 0) {

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);