diff options
| author |   mglocker <mglocker@openbsd.org> | 2020-07-31 10:49:32 +0000 |
|---|---|---|
| committer | mglocker <mglocker@openbsd.org> | 2020-07-31 10:49:32 +0000 |
| commit | f88cb03e085123a1ce9f8aeffa574a2b265c4931 (patch) | |
| tree | 4659c6bf4ba3d20b2d85c828195634ecc472040d /sys/dev/usb/if_url.c | |
| parent | Replace warnc() with warnx() + strerror() since the first is less portable. (diff) | |
| download | wireguard-openbsd-f88cb03e085123a1ce9f8aeffa574a2b265c4931.tar.xz wireguard-openbsd-f88cb03e085123a1ce9f8aeffa574a2b265c4931.zip | |
Nuke all occurrences of usbd_abort_pipe() if it gets called right
before usbd_close_pipe(), since usbd_close_pipe() already takes care
about aborting non-empty pipes.
As investigated by gerhard@ usbdi.c rev. 1.57 did add usbd_abort_pipe()
to usbd_close_pipe(), but the drivers didn't get cleaned up afterwards.
ok gerhard@
Diffstat (limited to 'sys/dev/usb/if_url.c')
| -rw-r--r-- | sys/dev/usb/if_url.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 411258587e6..9dd96117492 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.87 2020/07/10 13:26:41 patrick Exp $ */ +/* $OpenBSD: if_url.c,v 1.88 2020/07/31 10:49:33 mglocker Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -1086,7 +1086,6 @@ url_stop(struct ifnet *ifp, int disable) /* Stop transfers */ /* RX endpoint */ if (sc->sc_pipe_rx != NULL) { - usbd_abort_pipe(sc->sc_pipe_rx); err = usbd_close_pipe(sc->sc_pipe_rx); if (err) printf("%s: close rx pipe failed: %s\n", @@ -1096,7 +1095,6 @@ url_stop(struct ifnet *ifp, int disable) /* TX endpoint */ if (sc->sc_pipe_tx != NULL) { - usbd_abort_pipe(sc->sc_pipe_tx); err = usbd_close_pipe(sc->sc_pipe_tx); if (err) printf("%s: close tx pipe failed: %s\n", @@ -1108,7 +1106,6 @@ url_stop(struct ifnet *ifp, int disable) /* XXX: Interrupt endpoint is not yet supported!! */ /* Interrupt endpoint */ if (sc->sc_pipe_intr != NULL) { - usbd_abort_pipe(sc->sc_pipe_intr); err = usbd_close_pipe(sc->sc_pipe_intr); if (err) printf("%s: close intr pipe failed: %s\n", |