summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2006-11-25 16:26:09 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2006-11-25 16:26:09 +0000
commit2b8603a832c3250b40f3925789ac42d908287205 (patch)
tree515e6403affd94b0bd9a714e22076d959f9031db /sys
parent4f8c985557c57a61fe9c8836eee54d484be827c9 (diff)
Don't handle acpiev events inside the gpe handler since this causes deadlocks.
ok jordan@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/acpi/acpi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 54b7f9e13be..eb443762454 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.62 2006/11/15 21:41:51 kettenis Exp $ */
+/* $OpenBSD: acpi.c,v 1.63 2006/11/25 16:26:08 marco Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -1654,8 +1654,6 @@ acpi_isr_thread(void *arg)
KNOTE(sc->sc_note, ACPI_EVENT_COMPOSE(ACPI_EV_SLPBTN,
acpi_evindex));
}
- if (sc->sc_ec)
- acpiec_handle_events(sc->sc_ec);
}
free(thread, M_DEVBUF);