summaryrefslogtreecommitdiff
path: root/sys/dev/acpi
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2006-05-31 10:34:55 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2006-05-31 10:34:55 +0000
commit478da6c538eef7781713b07cb3f4f96dc2d87125 (patch)
tree7c36022b9ef65a939430c43ac319c5606e50368c /sys/dev/acpi
parent92997dcc968b37d6a6af4345f642423dc0bb87fc (diff)
do not call acpi_powerdown() unless acpi has successfully initialized
ok gwk@ canacar@
Diffstat (limited to 'sys/dev/acpi')
-rw-r--r--sys/dev/acpi/acpi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 56c308e92ec..d1acf1e89ab 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.50 2006/05/29 00:54:23 canacar Exp $ */
+/* $OpenBSD: acpi.c,v 1.51 2006/05/31 10:34:54 todd Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -41,6 +41,7 @@
#ifdef ACPI_DEBUG
int acpi_debug = 11;
#endif
+int acpi_enabled = 0;
#define ACPIEN_RETRIES 15
@@ -686,6 +687,8 @@ acpi_attach(struct device *parent, struct device *self, void *aux)
}
#endif
+ acpi_enabled=1;
+
/*
* Load the DSDT from the FADT pointer -- use the
* extended (64-bit) pointer if it exists