summaryrefslogtreecommitdiffstats
path: root/sys/i386/acpica
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2012-06-01 18:18:48 +0000
committerjkim <jkim@FreeBSD.org>2012-06-01 18:18:48 +0000
commit2c2eaadd0737c825f3ac8cbdf9ce735f3aebb359 (patch)
tree2558aff556e89b90b6f3d673cd6ac9fe3e1aa678 /sys/i386/acpica
parent266a4711a8db1ee2d070e57976db3c821edce597 (diff)
downloadFreeBSD-src-2c2eaadd0737c825f3ac8cbdf9ce735f3aebb359.zip
FreeBSD-src-2c2eaadd0737c825f3ac8cbdf9ce735f3aebb359.tar.gz
Call AcpiSetFirmwareWakingVector() with interrupt disabled for consistency.
Diffstat (limited to 'sys/i386/acpica')
-rw-r--r--sys/i386/acpica/acpi_wakeup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index 2c07003..488226f 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -296,10 +296,10 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result,
#endif
mca_resume();
intr_resume();
+
+ AcpiSetFirmwareWakingVector(0);
} else {
/* Wakeup MD procedures in interrupt enabled context */
- AcpiSetFirmwareWakingVector(0);
-
if (sleep_result == 1 && mem_range_softc.mr_op != NULL &&
mem_range_softc.mr_op->reinit != NULL)
mem_range_softc.mr_op->reinit(&mem_range_softc);
OpenPOWER on IntegriCloud