[src/trunk]: src/sys/dev/usb usbdi(9): Fix mistake in usbdi.c 1.244.

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

details:   https://anonhg.NetBSD.org/src/rev/3319a4c78481
branches:  trunk
changeset: 370052:3319a4c78481
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Sep 13 10:32:41 2022 +0000

description:
usbdi(9): Fix mistake in usbdi.c 1.244.

Need to clear ux_timeout_set only when we finally actually process
the timeout in usbdi_xfer_timeout_task, not in the callout which
schedules the task which asserts that the timeout is still set on
entry.

Must've exported the wrong version of my change from git.

diffstat:

 sys/dev/usb/usbdi.c |  22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r 6dc3e9692a52 -r 3319a4c78481 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Tue Sep 13 10:18:58 2022 +0000
+++ b/sys/dev/usb/usbdi.c       Tue Sep 13 10:32:41 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.245 2022/09/13 09:47:17 riastradh Exp $    */
+/*     $NetBSD: usbdi.c,v 1.246 2022/09/13 10:32:41 riastradh Exp $    */
 
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.245 2022/09/13 09:47:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.246 2022/09/13 10:32:41 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1642,6 +1642,15 @@
                goto out;
 
        /*
+        * After this point, no further timeout probing will happen for
+        * the current incarnation of the timeout, so make the next
+        * usbd_xfer_schedule_timout schedule a new callout.
+        * usbd_xfer_probe_timeout has already processed any reset.
+        */
+       KASSERT(!xfer->ux_timeout_reset);
+       xfer->ux_timeout_set = false;
+
+       /*
         * May have completed or been aborted, but we're the only one
         * who can time it out.  If it has completed or been aborted,
         * no need to timeout.
@@ -1683,15 +1692,6 @@
        KASSERT(xfer->ux_timeout_set);
 
        /*
-        * After this point, no further timeout probing will happen for
-        * the current incarnation of the timeout, so make the next
-        * usbd_xfer_schedule_timout schedule a new callout.
-        * usbd_xfer_probe_timeout has already processed any reset.
-        */
-       KASSERT(!xfer->ux_timeout_reset);
-       xfer->ux_timeout_set = false;
-
-       /*
         * Neither callout nor task may be pending; they execute
         * alternately in lock step.
         */