diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2020-07-31 10:49:34 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2020-07-31 10:49:34 +0000 |
| commit | 988e4435cb386091d98bc3f6e2a43ae3d49c31cc (patch) | |
| tree | e93687d2c7dbfce91c3730840b1dff9623e1f1d0 /sys/dev/usb/usps.c | |
| parent | 29fbdf272cf7167bceff6cbfb042a1a74375df01 (diff) | |
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/usps.c')
| -rw-r--r-- | sys/dev/usb/usps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/usb/usps.c b/sys/dev/usb/usps.c index 7ec16c9c4fe..12cde0936d0 100644 --- a/sys/dev/usb/usps.c +++ b/sys/dev/usb/usps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usps.c,v 1.9 2017/04/08 02:57:25 deraadt Exp $ */ +/* $OpenBSD: usps.c,v 1.10 2020/07/31 10:49:33 mglocker Exp $ */ /* * Copyright (c) 2011 Yojiro UO <yuo@nui.org> @@ -297,7 +297,6 @@ usps_detach(struct device *self, int flags) s = splusb(); if (sc->sc_ipipe != NULL) { - usbd_abort_pipe(sc->sc_ipipe); usbd_close_pipe(sc->sc_ipipe); if (sc->sc_intrbuf != NULL) free(sc->sc_intrbuf, M_USBDEV, sc->sc_isize); |