[src/netbsd-9]: src/sys/dev/usb Pull up following revision(s) (requested by r...

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

details:   https://anonhg.NetBSD.org/src/rev/314360839afd
branches:  netbsd-9
changeset: 963630:314360839afd
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Feb 20 14:53:09 2020 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #716):

        sys/dev/usb/usbdi.c: revision 1.194

When aborting a pipe, set pipe->up_running = 0.

This prevents any concurrent usb_transfer_complete from restarting
the pipe with usbd_start_next.

diffstat:

 sys/dev/usb/usbdi.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r b29d45b956d9 -r 314360839afd sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Thu Feb 20 14:49:47 2020 +0000
+++ b/sys/dev/usb/usbdi.c       Thu Feb 20 14:53:09 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.182.4.1 2019/09/01 13:00:37 martin Exp $   */
+/*     $NetBSD: usbdi.c,v 1.182.4.2 2020/02/20 14:53:09 martin 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.182.4.1 2019/09/01 13:00:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.182.4.2 2020/02/20 14:53:09 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -876,6 +876,7 @@
                usbd_dump_queue(pipe);
 #endif
        pipe->up_repeat = 0;
+       pipe->up_running = 0;
        pipe->up_aborting = 1;
        while ((xfer = SIMPLEQ_FIRST(&pipe->up_queue)) != NULL) {
                USBHIST_LOG(usbdebug, "pipe = %#jx xfer = %#jx "