summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2004-09-21 17:19:38 +0000
committernjl <njl@FreeBSD.org>2004-09-21 17:19:38 +0000
commitb10f58fed2c8bc13a4ee12368948687aaa8ae862 (patch)
tree7e1ff26af1c4f07208253bc322523887189fd46f /sys/dev/acpica
parentbdfb27dfb7a7122fcf90dbf94637adc9bd246dc5 (diff)
downloadFreeBSD-src-b10f58fed2c8bc13a4ee12368948687aaa8ae862.zip
FreeBSD-src-b10f58fed2c8bc13a4ee12368948687aaa8ae862.tar.gz
Don't disable acpi in shutdown if we're panicing (panicstr != NULL). This
may help with double panics.
Diffstat (limited to 'sys/dev/acpica')
-rw-r--r--sys/dev/acpica/acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 7c874da..6769b06 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -1365,7 +1365,7 @@ acpi_shutdown_final(void *arg, int howto)
DELAY(1000000);
printf("ACPI power-off failed - timeout\n");
}
- } else {
+ } else if (panicstr == NULL) {
printf("Shutting down ACPI\n");
AcpiTerminate();
}
OpenPOWER on IntegriCloud