summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Ratchov <ratchov@cvs.openbsd.org>2014-03-23 11:48:24 +0000
committerAlexandre Ratchov <ratchov@cvs.openbsd.org>2014-03-23 11:48:24 +0000
commitf15b60181d372f49e52f78e4bf7a19bb88e20710 (patch)
tree13e1cd0ceaab3fc15c35cb37edb129160315af09
parent74c6d75480fab4e59b3cc571eac19f8bf74106a6 (diff)
my bad, last commit was not ok deraadt, revert it.
-rw-r--r--sys/dev/pckbc/pckbd.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c
index 81215f8fe0b..bf5654cc844 100644
--- a/sys/dev/pckbc/pckbd.c
+++ b/sys/dev/pckbc/pckbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbd.c,v 1.36 2014/03/13 07:48:14 ratchov Exp $ */
+/* $OpenBSD: pckbd.c,v 1.37 2014/03/23 11:48:23 ratchov Exp $ */
/* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */
/*-
@@ -911,7 +911,12 @@ pckbd_input(void *vsc, int data)
sc->sc_rawcnt);
sc->sc_rawcnt = 0;
}
- return;
+
+ /*
+ * Pass audio keys to wskbd_input anyway.
+ */
+ if (rc == 0 || (key != 160 && key != 174 && key != 176))
+ return;
}
#endif
if (rc != 0)