diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-04-26 14:53:20 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2013-04-26 14:53:20 +0000 |
| commit | fd4f4bea7bee00962ac8b0a724a7f53893671113 (patch) | |
| tree | 5523a4e4fc962356b50a23afdd49ea51e41d622a /sys/dev/usb | |
| parent | bd29ddfad9b2da1f120b8ed0f88f780b7087232d (diff) | |
Don't use usbd_bulk_transfer() to submit a synchronous transfer here too.
ok mglocker@
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/uvideo.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 3d1a75354bc..5180d37d8f3 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.171 2013/04/26 13:46:40 mglocker Exp $ */ +/* $OpenBSD: uvideo.c,v 1.172 2013/04/26 14:53:19 mpi Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -1885,14 +1885,16 @@ uvideo_vs_start_bulk_thread(void *arg) while (sc->sc_vs_cur->bulk_running) { size = UGETDW(sc->sc_desc_probe.dwMaxPayloadTransferSize); - error = usbd_bulk_transfer( + usbd_setup_xfer( sc->sc_vs_cur->bxfer.xfer, sc->sc_vs_cur->pipeh, - USBD_NO_COPY | USBD_SHORT_XFER_OK, - USBD_NO_TIMEOUT, + 0, sc->sc_vs_cur->bxfer.buf, - &size, - "vid_bulk"); + size, + USBD_NO_COPY | USBD_SHORT_XFER_OK | USBD_SYNCHRONOUS, + 0, + NULL); + error = usbd_transfer(sc->sc_vs_cur->bxfer.xfer); if (error != USBD_NORMAL_COMPLETION) { DPRINTF(1, "%s: error in bulk xfer: %s!\n", DEVNAME(sc), usbd_errstr(error)); |