[src/trunk]: src/sys/dev/usb umass(4): Reduce timeout for control xfers to st...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ac3fa8ce2f08
branches:  trunk
changeset: 370638:ac3fa8ce2f08
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Sep 22 14:27:52 2022 +0000

description:
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:

 sys/dev/usb/umass.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 866938505e63 -r ac3fa8ce2f08 sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c       Thu Sep 22 14:27:02 2022 +0000
+++ b/sys/dev/usb/umass.c       Thu Sep 22 14:27:52 2022 +0000
@@ -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 @@
 
        /* 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) {