diff options
| author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2005-03-28 04:46:34 +0000 |
|---|---|---|
| committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2005-03-28 04:46:34 +0000 |
| commit | b8fec28ebbcb3d0f35f713c3b190f3f24b7e137f (patch) | |
| tree | d0e513ca473a9277b15006a57264512cfd3d2549 /sys/dev/usb | |
| parent | 9bc262055ba0908a1d219477684d367c8ff84461 (diff) | |
Use USBD_DEFAULT_TIMEOUT on control transfers, rather than the SCSI request
timeout.
ok dlg@
Diffstat (limited to 'sys/dev/usb')
| -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) { |