summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-09-22 14:27:52 +0000
committerriastradh <riastradh@NetBSD.org>2022-09-22 14:27:52 +0000
commit50fca64f8a20ee82c47aa27604856ad68def2087 (patch)
tree692929751ed7ce6927018c20f30e187a2f0bcbc4 /sys/dev/usb
parentc673de13037fd1a4c0e8ccb407cbf4bd35df84c5 (diff)
umass(4): Reduce timeout for control xfers to standard USB timeout.
This should reduce the timeout for a failed sd@umass transfer from n*(1min + 5sec) to 1min + n*5sec where n is the number of reset and clear-stall steps.
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/umass.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index d747490c725..f8a3f8c44cd 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.188 2022/03/20 19:26:27 andvar Exp $ */
+/* $NetBSD: umass.c,v 1.189 2022/09/22 14:27:52 riastradh Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.188 2022/03/20 19:26:27 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.189 2022/09/22 14:27:52 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1012,8 +1012,8 @@ 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, sc, USBD_DEFAULT_TIMEOUT,
+ req, buffer, buflen, flags, sc->sc_methods->wire_state);
err = usbd_transfer(xfer);
if (err && err != USBD_IN_PROGRESS) {