summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2013-03-02 22:57:31 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2013-03-02 22:57:31 +0000
commitbaa8df024d703544b5f91205b39a53cbd1437f13 (patch)
treed0a1d835ed60ede675dca927bcb4b7111b7b692c /sys/dev
parentcc33610afa62105295c01c8341b38ca8ffaed45c (diff)
Decide whether to use polling or not only upon `sc_bus.use_polling', regardless
of the value of `cold'. This is similar to what the other hci drivers do, and has not caused any regressions on the few systems this has been tested on. Commited now to have a change to expose ohci-specific regressions (if any).
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/ohci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index c34f076ee7f..39aa7bfe52c 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.106 2012/08/07 23:51:36 krw Exp $ */
+/* $OpenBSD: ohci.c,v 1.107 2013/03/02 22:57:30 miod Exp $ */
/* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -1073,7 +1073,7 @@ ohci_intr(void *p)
return (0);
/* If we get an interrupt while polling, then just ignore it. */
- if (!cold && sc->sc_bus.use_polling) {
+ if (sc->sc_bus.use_polling) {
#ifdef DIAGNOSTIC
static struct timeval ohci_intr_tv;
if ((OREAD4(sc, OHCI_INTERRUPT_STATUS) & sc->sc_eintrs) &&