Pull suspend into release branch (e67c5d8d) · Commits · 戴 / test

drivers/acpi/hardware/hwsleep.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -234,15 +234,11 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
		"While executing method _SST"));
		}

		/*
		* 1) Disable/Clear all GPEs
		*/
		/* Disable/Clear all GPEs */

		status = acpi_hw_disable_all_gpes();
		if (ACPI_FAILURE(status)) {
		return_ACPI_STATUS(status);
		}

		return_ACPI_STATUS(AE_OK);
		return_ACPI_STATUS(status);
		}

		ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)

+5 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,11 @@ static int acpi_hibernation_enter(void)

		static void acpi_hibernation_finish(void)
		{
		/*
		* If ACPI is not enabled by the BIOS and the boot kernel, we need to
		* enable it here.
		*/
		acpi_enable();
		acpi_leave_sleep_state(ACPI_STATE_S4);
		acpi_disable_wakeup_device(ACPI_STATE_S4);