summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2010-02-22 17:24:20 +0000
committermiod <miod@openbsd.org>2010-02-22 17:24:20 +0000
commit7511425151a8b125bfa9f0913c01bc420513d211 (patch)
treec41f11f6f739732dad85126b79863ff33215e796
parentUse the logical or operator, not the bitwise operator in (diff)
downloadwireguard-openbsd-7511425151a8b125bfa9f0913c01bc420513d211.tar.xz
wireguard-openbsd-7511425151a8b125bfa9f0913c01bc420513d211.zip
Undo 1.48 and 1.49 for now, and go back to the drawing board; PR #6320
-rw-r--r--sys/dev/usb/ukbd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 17634e37705..8fa1e46d89a 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukbd.c,v 1.50 2009/11/25 13:36:53 miod Exp $ */
+/* $OpenBSD: ukbd.c,v 1.51 2010/02/22 17:24:20 miod Exp $ */
/* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -546,7 +546,7 @@ ukbd_intr(struct uhidev *addr, void *ibuf, u_int len)
* polling from inside the interrupt routine and that
* loses bigtime.
*/
- if (!timeout_pending(&sc->sc_delay)) {
+ /* if (!timeout_pending(&sc->sc_delay)) */ {
sc->sc_data = *ud;
timeout_add(&sc->sc_delay, 1);
}