diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-06-01 17:00:33 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-06-01 17:00:33 +0000 |
| commit | 4d46ef51dd4db29e16815eeb1bed9f4c671c02ee (patch) | |
| tree | df0c81c690e4deb5ec6441b928e045ac02b61652 /sys/dev/acpica | |
| parent | d9073c1e6aa93a5d335343304113b5dad3e64879 (diff) | |
| download | src-4d46ef51dd4db29e16815eeb1bed9f4c671c02ee.tar.gz src-4d46ef51dd4db29e16815eeb1bed9f4c671c02ee.zip | |
Execute AcpiLeaveSleepStatePrep() for S1 and reduce code duplication.
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=236408
Diffstat (limited to 'sys/dev/acpica')
| -rw-r--r-- | sys/dev/acpica/acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 730a954e8a13..56f4fdb7668a 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -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", |