summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpascoe <pascoe@openbsd.org>2005-03-06 05:30:07 +0000
committerpascoe <pascoe@openbsd.org>2005-03-06 05:30:07 +0000
commitee42f2a352f05efb863a67a4942462af6f5dab5c (patch)
tree2450e1165ea2cf05ef8c8ab975edcea54e8b1160
parentFix incorrect comment about interrupt threshold control level. (diff)
downloadwireguard-openbsd-ee42f2a352f05efb863a67a4942462af6f5dab5c.tar.xz
wireguard-openbsd-ee42f2a352f05efb863a67a4942462af6f5dab5c.zip
ohci_rhsc_enable calls usb_transfer_complete via ohci_rhsc - we need to be
at splusb, not splsoftclock. ok dlg@
-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 720696b92b0..f17deedaa3a 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.53 2005/03/06 05:12:00 pascoe Exp $ */
+/* $OpenBSD: ohci.c,v 1.54 2005/03/06 05:30:07 pascoe 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 $ */
@@ -1222,11 +1222,11 @@ ohci_rhsc_enable(void *v_sc)
ohci_softc_t *sc = v_sc;
int s;
+ s = splhardusb();
ohci_rhsc(sc, sc->sc_intrxfer);
DPRINTFN(2, ("%s: rhsc interrupt enabled\n",
USBDEVNAME(sc->sc_bus.bdev)));
- s = splhardusb();
ohci_rhsc_able(sc, 1);
splx(s);
}