upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Execute AcpiLeaveSleepStatePrep() for S1 and reduce code duplication.

Browse source 
MFC after:	3 days
This commit is contained in:
Jung-uk Kim 2012-06-01 17:00:33 +00:00
parent d9073c1e6a
commit 4d46ef51dd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/dev/acpica/acpi.c
View file

@ -2746,8 +2746,8 @@ acpi_EnterSleepState(struct acpi_softc *sc, int state)
if (sc->acpi_sleep_delay > 0)
DELAY(sc->acpi_sleep_delay * 1000000);
intr = intr_disable();
if (state != ACPI_STATE_S1) {
intr = intr_disable();
sleep_result = acpi_sleep_machdep(sc, state);
acpi_wakeup_machdep(sc, state, sleep_result, 0);
AcpiLeaveSleepStatePrep(state, acpi_sleep_flags);
@ -2763,8 +2763,8 @@ acpi_EnterSleepState(struct acpi_softc *sc, int state)
if (state == ACPI_STATE_S4)
AcpiEnable();
} else {
intr = intr_disable();
status = AcpiEnterSleepState(state, acpi_sleep_flags);
AcpiLeaveSleepStatePrep(state, acpi_sleep_flags);
intr_restore(intr);
if (ACPI_FAILURE(status)) {
device_printf(sc->acpi_dev, "AcpiEnterSleepState failed - %s\n",