summaryrefslogtreecommitdiff
path: root/sys/dev/ic/pckbc.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-02-02 21:40:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-02-02 21:40:21 +0000
commit9ba91696aad979f35872eff01abeb2c7dd2e10e1 (patch)
treee691d03f7f9aa325dc7d9c77d83ab54f7f4a10cf /sys/dev/ic/pckbc.c
parentbcd13d2225e39795487411c72b679b8be2bcf286 (diff)
disable the polling timeout when we suspend; discovered by some code
guenther is working on ok miod
Diffstat (limited to 'sys/dev/ic/pckbc.c')
-rw-r--r--sys/dev/ic/pckbc.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index b58bea3a4e3..5f388e42b01 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.28 2010/12/03 18:29:56 shadchin Exp $ */
+/* $OpenBSD: pckbc.c,v 1.29 2012/02/02 21:40:20 deraadt Exp $ */
/* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
/*
@@ -732,6 +732,17 @@ pckbc_cleanup(void *self)
}
/*
+ * Stop the keyboard controller when we are going to suspend
+ */
+void
+pckbc_stop(struct pckbc_softc *sc)
+{
+ struct pckbc_internal *t = sc->id;
+
+ timeout_del(&t->t_poll);
+}
+
+/*
* Reset the keyboard controller in a violent fashion; normally done
* after suspend/resume when we do not trust the machine.
*/