summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorChristopher Pascoe <pascoe@cvs.openbsd.org>2005-03-06 06:51:54 +0000
committerChristopher Pascoe <pascoe@cvs.openbsd.org>2005-03-06 06:51:54 +0000
commit3d3ec64c957e2749c55f0c5a92431eb00f04f60b (patch)
treef2c5cbfe12a07ddfc84fbd804c7911ea12c420e9 /sys
parent62ca6997c903e198f323ecfad58c87fc3924e798 (diff)
Wait for the bulk transfer to complete before returning if we are in polled
mode. ok dlg@
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/ohci.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index f17deedaa3a..9a515047e16 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.54 2005/03/06 05:30:07 pascoe Exp $ */
+/* $OpenBSD: ohci.c,v 1.55 2005/03/06 06:51:53 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 $ */
@@ -2781,6 +2781,7 @@ ohci_device_ctrl_start(usbd_xfer_handle xfer)
if (sc->sc_bus.use_polling)
ohci_waitintr(sc, xfer);
+
return (USBD_IN_PROGRESS);
}
@@ -2929,6 +2930,9 @@ ohci_device_bulk_start(usbd_xfer_handle xfer)
splx(s);
+ if (sc->sc_bus.use_polling)
+ ohci_waitintr(sc, xfer);
+
return (USBD_IN_PROGRESS);
}