D54777.id170055.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D54777.id170055.diff
View Options

	diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
	--- a/sys/dev/acpica/acpi.c
	+++ b/sys/dev/acpica/acpi.c
	@@ -3645,8 +3645,8 @@
	AcpiFormatException(status));
	goto backout;
	}
	+ slp_state \|= ACPI_SS_SLP_PREP;
	}
	- slp_state \|= ACPI_SS_SLP_PREP;

	if (sc->acpi_sleep_delay > 0)
	DELAY(sc->acpi_sleep_delay * 1000000);
	@@ -3672,16 +3672,13 @@
	case POWER_STYPE_UNKNOWN:
	__unreachable();
	}
	+ resumeclock();

	/*
	* Back out state according to how far along we got in the suspend
	* process. This handles both the error and success cases.
	*/
	backout:
	- if ((slp_state & ACPI_SS_SLP_PREP) != 0) {
	- resumeclock();
	- slp_state &= ~ACPI_SS_SLP_PREP;
	- }
	if ((slp_state & ACPI_SS_GPE_SET) != 0) {
	acpi_wake_prep_walk(sc, stype);
	sc->acpi_stype = POWER_STYPE_AWAKE;
	@@ -3691,7 +3688,7 @@
	DEVICE_RESUME(root_bus);
	slp_state &= ~ACPI_SS_DEV_SUSPEND;
	}
	- if (stype != POWER_STYPE_SUSPEND_TO_IDLE && (slp_state & ACPI_SS_SLP_PREP) != 0) {
	+ if ((slp_state & ACPI_SS_SLP_PREP) != 0) {
	AcpiLeaveSleepState(acpi_sstate);
	slp_state &= ~ACPI_SS_SLP_PREP;
	}