Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb When aborting a pipe, set pipe->up_running = 0.



details:   https://anonhg.NetBSD.org/src/rev/3a37c7fe79a1
branches:  trunk
changeset: 744920:3a37c7fe79a1
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Feb 17 08:16:44 2020 +0000

description:
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 01c33f054ca0 -r 3a37c7fe79a1 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Mon Feb 17 06:32:46 2020 +0000
+++ b/sys/dev/usb/usbdi.c       Mon Feb 17 08:16:44 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usbdi.c,v 1.193 2020/02/16 09:40:35 maxv Exp $ */
+/*     $NetBSD: usbdi.c,v 1.194 2020/02/17 08:16:44 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.193 2020/02/16 09:40:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.194 2020/02/17 08:16:44 riastradh 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 "



Home | Main Index | Thread Index | Old Index