[src/trunk]: src/sys/dev/usb ucom(4): Fix earlier mistake causing pipes not t...

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

details:   https://anonhg.NetBSD.org/src/rev/75113a178971
branches:  trunk
changeset: 984147:75113a178971
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Jun 24 08:20:42 2021 +0000

description:
ucom(4): Fix earlier mistake causing pipes not to be closed.

In revision 1.123, mrg@ changed what he thought was a double-close,
but was actually abort&close (as is appropriate) to just abort (which
is not enough -- leaks the pipe).  This restores the abort&close.

The original `bug' was found by code inspection, whereas this bug was
found by asserting in usb_subr.c that no pipes are open on device
disconnection after detach; the asserts actually triggered with
several ucom(4) devices, and no longer trigger with this change.

XXX pullup-9

diffstat:

 sys/dev/usb/ucom.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 7d06825decd3 -r 75113a178971 sys/dev/usb/ucom.c
--- a/sys/dev/usb/ucom.c        Thu Jun 24 07:16:49 2021 +0000
+++ b/sys/dev/usb/ucom.c        Thu Jun 24 08:20:42 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ucom.c,v 1.128 2020/10/26 12:24:10 mrg Exp $   */
+/*     $NetBSD: ucom.c,v 1.129 2021/06/24 08:20:42 riastradh Exp $     */
 
 /*
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.128 2020/10/26 12:24:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.129 2021/06/24 08:20:42 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -414,11 +414,9 @@
 
        if (sc->sc_bulkin_pipe != NULL) {
                usbd_abort_pipe(sc->sc_bulkin_pipe);
-               sc->sc_bulkin_pipe = NULL;
        }
        if (sc->sc_bulkout_pipe != NULL) {
                usbd_abort_pipe(sc->sc_bulkout_pipe);
-               sc->sc_bulkout_pipe = NULL;
        }
 
        mutex_enter(&sc->sc_lock);