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/uhub.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/uhub.c')
| -rw-r--r-- | sys/dev/usb/uhub.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 2c7e79ab4be..598f7ec5316 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhub.c,v 1.94 2020/03/16 13:17:17 mpi Exp $ */ +/* $OpenBSD: uhub.c,v 1.95 2020/07/31 10:49:33 mglocker Exp $ */ /* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ @@ -456,7 +456,6 @@ uhub_detach(struct device *self, int flags) if (hub == NULL) /* Must be partially working */ return (0); - usbd_abort_pipe(sc->sc_ipipe); usbd_close_pipe(sc->sc_ipipe); for (port = 0; port < hub->nports; port++) { |