diff options
| author | jkim <jkim@FreeBSD.org> | 2012-02-16 22:59:29 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-02-16 22:59:29 +0000 |
| commit | a561c762bacb78b14d2bf5fb20afc1566203f990 (patch) | |
| tree | d4ae2db1980d2ec7b164b1a5658fd2ae62569456 /sys/dev/acpica/acpi.c | |
| parent | 2b86faa18cb89921d202e133fa6a1c39b63cfe16 (diff) | |
| parent | a6dfe3119152f97e640cc135d963b9f7c95c84ef (diff) | |
| download | FreeBSD-src-a561c762bacb78b14d2bf5fb20afc1566203f990.zip FreeBSD-src-a561c762bacb78b14d2bf5fb20afc1566203f990.tar.gz | |
Merge ACPICA 20120215.
Diffstat (limited to 'sys/dev/acpica/acpi.c')
| -rw-r--r-- | sys/dev/acpica/acpi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index c613461..fc5fec1 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2715,7 +2715,8 @@ acpi_EnterSleepState(struct acpi_softc *sc, int state) DELAY(sc->acpi_sleep_delay * 1000000); if (state != ACPI_STATE_S1) { - acpi_sleep_machdep(sc, state); + if (acpi_sleep_machdep(sc, state)) + goto backout; /* Re-enable ACPI hardware on wakeup from sleep state 4. */ if (state == ACPI_STATE_S4) @@ -2740,8 +2741,10 @@ backout: acpi_wake_prep_walk(state); sc->acpi_sstate = ACPI_STATE_S0; } - if (slp_state >= ACPI_SS_SLP_PREP) + if (slp_state >= ACPI_SS_SLP_PREP) { + AcpiLeaveSleepStatePrep(state); AcpiLeaveSleepState(state); + } if (slp_state >= ACPI_SS_DEV_SUSPEND) DEVICE_RESUME(root_bus); if (slp_state >= ACPI_SS_SLEPT) { |
