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/uts.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/uts.c')
| -rw-r--r-- | sys/dev/usb/uts.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c index d75c870e82b..aa2fbd87256 100644 --- a/sys/dev/usb/uts.c +++ b/sys/dev/usb/uts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uts.c,v 1.42 2019/11/06 20:25:14 mglocker Exp $ */ +/* $OpenBSD: uts.c,v 1.43 2020/07/31 10:49:33 mglocker Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -216,7 +216,6 @@ uts_detach(struct device *self, int flags) int rv = 0; if (sc->sc_intr_pipe != NULL) { - usbd_abort_pipe(sc->sc_intr_pipe); usbd_close_pipe(sc->sc_intr_pipe); sc->sc_intr_pipe = NULL; } @@ -288,7 +287,6 @@ uts_disable(void *v) /* Disable interrupts. */ if (sc->sc_intr_pipe != NULL) { - usbd_abort_pipe(sc->sc_intr_pipe); usbd_close_pipe(sc->sc_intr_pipe); sc->sc_intr_pipe = NULL; } |