diff options
| author |   pascoe <pascoe@openbsd.org> | 2005-03-28 04:46:33 +0000 |
|---|---|---|
| committer | pascoe <pascoe@openbsd.org> | 2005-03-28 04:46:33 +0000 |
| commit | 3097f3d57742df8e4bf6f95e767944a66c8f0da3 (patch) | |
| tree | 5e8b991cbf555df2e2defbbf7031dff5353ddc88 /sys/dev/usb/umass.c | |
| parent | minor spelling corrections. (diff) | |
| download | wireguard-openbsd-3097f3d57742df8e4bf6f95e767944a66c8f0da3.tar.xz wireguard-openbsd-3097f3d57742df8e4bf6f95e767944a66c8f0da3.zip | |
Use USBD_DEFAULT_TIMEOUT on control transfers, rather than the SCSI request
timeout.
ok dlg@
Diffstat (limited to 'sys/dev/usb/umass.c')
| -rw-r--r-- | sys/dev/usb/umass.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index ebdb1268eff..aff2f9c3ece 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.37 2005/03/28 04:40:15 pascoe Exp $ */ +/* $OpenBSD: umass.c,v 1.38 2005/03/28 04:46:33 pascoe Exp $ */ /* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */ /* @@ -782,8 +782,9 @@ umass_setup_ctrl_transfer(struct umass_softc *sc, usb_device_request_t *req, /* Initialise a USB control transfer and then schedule it */ - usbd_setup_default_xfer(xfer, sc->sc_udev, (void *) sc, sc->timeout, - req, buffer, buflen, flags, sc->sc_methods->wire_state); + usbd_setup_default_xfer(xfer, sc->sc_udev, (void *) sc, + USBD_DEFAULT_TIMEOUT, req, buffer, buflen, flags, + sc->sc_methods->wire_state); err = usbd_transfer(xfer); if (err && err != USBD_IN_PROGRESS) { |