Module Name: src
Committed By: jruoho
Date: Sat Feb 19 19:39:28 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_ec.c
Log Message:
After the GPE handler has finished, inform ACPICA that the interrupt has
been handled and it is safe to re-enable the GPE. Should fix all problems
introduced during the merge of ACPICA 20110211.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/acpi/acpi_ec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.69 src/sys/dev/acpi/acpi_ec.c:1.70
--- src/sys/dev/acpi/acpi_ec.c:1.69 Thu Feb 17 10:49:29 2011
+++ src/sys/dev/acpi/acpi_ec.c Sat Feb 19 19:39:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.69 2011/02/17 10:49:29 jruoho Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.70 2011/02/19 19:39:28 jruoho Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <[email protected]>.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.69 2011/02/17 10:49:29 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.70 2011/02/19 19:39:28 jruoho Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -853,7 +853,7 @@
acpiec_gpe_state_machine(dv);
mutex_exit(&sc->sc_mtx);
- return 0;
+ return ACPI_INTERRUPT_HANDLED | ACPI_REENABLE_GPE;
}
ACPI_STATUS
