Index: sys/dev/usb/ehci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ehci.c,v
retrieving revision 1.228
diff -u -p -r1.228 ehci.c
--- sys/dev/usb/ehci.c	5 Aug 2014 10:33:46 -0000	1.228
+++ sys/dev/usb/ehci.c	14 Dec 2015 11:04:09 -0000
@@ -350,7 +350,7 @@ ehci_init(ehci_softc_t *sc)
 #endif
 
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "ehciab");
 	cv_init(&sc->sc_doorbell, "ehcidi");
 
Index: sys/dev/usb/motg.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/motg.c,v
retrieving revision 1.6.4.2
diff -u -p -r1.6.4.2 motg.c
--- sys/dev/usb/motg.c	12 Nov 2014 19:54:46 -0000	1.6.4.2
+++ sys/dev/usb/motg.c	14 Dec 2015 11:04:14 -0000
@@ -444,7 +444,7 @@ motg_init(struct motg_softc *sc)
 	    "motgxfer", NULL, IPL_USB, NULL, NULL, NULL);
 
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 
 	/* Set up the bus struct. */
 	sc->sc_bus.methods = &motg_bus_methods;
Index: sys/dev/usb/ohci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ohci.c,v
retrieving revision 1.253.2.1
diff -u -p -r1.253.2.1 ohci.c
--- sys/dev/usb/ohci.c	1 Dec 2014 11:38:43 -0000	1.253.2.1
+++ sys/dev/usb/ohci.c	14 Dec 2015 11:04:17 -0000
@@ -645,7 +645,7 @@ ohci_init(ohci_softc_t *sc)
 	callout_init(&sc->sc_tmo_rhsc, CALLOUT_MPSAFE);
 
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "ohciab");
 
 	sc->sc_rhsc_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
@@ -3191,7 +3191,7 @@ ohci_device_intr_start(usbd_xfer_handle 
 	tail->xfer = NULL;
 
 	data->td.td_flags = HTOO32(
-		isread ? OHCI_TD_IN : OHCI_TD_OUT |
+		(isread ? OHCI_TD_IN : OHCI_TD_OUT) |
 		OHCI_TD_NOCC |
 		OHCI_TD_SET_DI(1) | OHCI_TD_TOGGLE_CARRY);
 	if (xfer->flags & USBD_SHORT_XFER_OK)
Index: sys/dev/usb/uhci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/uhci.c,v
retrieving revision 1.264
diff -u -p -r1.264 uhci.c
--- sys/dev/usb/uhci.c	5 Aug 2014 06:35:24 -0000	1.264
+++ sys/dev/usb/uhci.c	14 Dec 2015 11:04:19 -0000
@@ -530,7 +530,7 @@ uhci_init(uhci_softc_t *sc)
 	callout_init(&sc->sc_poll_handle, CALLOUT_MPSAFE);
 
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "uhciab");
 
 	/* Set up the bus struct. */
Index: sys/dev/usb/xhci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/xhci.c,v
retrieving revision 1.23.2.3
diff -u -p -r1.23.2.3 xhci.c
--- sys/dev/usb/xhci.c	2 Jan 2015 22:44:34 -0000	1.23.2.3
+++ sys/dev/usb/xhci.c	14 Dec 2015 11:04:21 -0000
@@ -836,7 +836,7 @@ xhci_init(struct xhci_softc *sc)
 	    xhci_op_read_4(sc, XHCI_USBCMD));
 
 	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
+	mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_USB);
 	cv_init(&sc->sc_softwake_cv, "xhciab");
 
 	sc->sc_xferpool = pool_cache_init(sizeof(struct xhci_xfer), 0, 0, 0,
Index: sys/dev/pci/ehci_pci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/ehci_pci.c,v
retrieving revision 1.58
diff -u -p -r1.58 ehci_pci.c
--- sys/dev/pci/ehci_pci.c	29 Mar 2014 19:28:24 -0000	1.58
+++ sys/dev/pci/ehci_pci.c	14 Dec 2015 11:04:21 -0000
@@ -178,7 +178,7 @@ ehci_pci_attach(device_t parent, device_
 	 * Allocate IRQ
 	 */
 	intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-	sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, ehci_intr, sc);
+	sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, ehci_intr, sc);
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt");
 		if (intrstr != NULL)
Index: sys/dev/pci/ohci_pci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/ohci_pci.c,v
retrieving revision 1.52
diff -u -p -r1.52 ohci_pci.c
--- sys/dev/pci/ohci_pci.c	29 Mar 2014 19:28:25 -0000	1.52
+++ sys/dev/pci/ohci_pci.c	14 Dec 2015 11:04:21 -0000
@@ -143,7 +143,7 @@ ohci_pci_attach(device_t parent, device_
 	 * Allocate IRQ
 	 */
 	intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-	sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, ohci_intr, sc);
+	sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, ohci_intr, sc);
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt");
 		if (intrstr != NULL)
Index: sys/dev/pci/uhci_pci.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/uhci_pci.c,v
retrieving revision 1.57
diff -u -p -r1.57 uhci_pci.c
--- sys/dev/pci/uhci_pci.c	29 Mar 2014 19:28:25 -0000	1.57
+++ sys/dev/pci/uhci_pci.c	14 Dec 2015 11:04:21 -0000
@@ -133,7 +133,7 @@ uhci_pci_attach(device_t parent, device_
 		return;
 	}
 	intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-	sc->sc_ih = pci_intr_establish(pc, ih, IPL_SCHED, uhci_intr, sc);
+	sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, uhci_intr, sc);
 	if (sc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt");
 		if (intrstr != NULL)