D15306.diff
No OneTemporary
Actions

Size

679 B

Referenced Files

None

Subscribers

None

D15306.diff
View Options

	Index: sys/dev/acpica/acpi.c
	===================================================================
	--- sys/dev/acpica/acpi.c
	+++ sys/dev/acpica/acpi.c
	@@ -2975,8 +2975,6 @@
	if (sleep_result == 1 && state != ACPI_STATE_S4)
	AcpiWriteBitRegister(ACPI_BITREG_SCI_ENABLE, ACPI_ENABLE_EVENT);

	- AcpiLeaveSleepStatePrep(state);
	-
	if (sleep_result == 1 && state == ACPI_STATE_S3) {
	/*
	* Prevent mis-interpretation of the wakeup by power button
	@@ -3004,6 +3002,8 @@

	/* call acpi_wakeup_machdep() again with interrupt enabled */
	acpi_wakeup_machdep(sc, state, sleep_result, 1);
	+
	+ AcpiLeaveSleepStatePrep(state);

	if (sleep_result == -1)
	goto backout;