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/if_aue.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/if_aue.c')
| -rw-r--r-- | sys/dev/usb/if_aue.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 71a5f2f8898..79444195935 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.110 2020/07/10 13:26:40 patrick Exp $ */ +/* $OpenBSD: if_aue.c,v 1.111 2020/07/31 10:49:32 mglocker Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -1518,7 +1518,6 @@ aue_stop(struct aue_softc *sc) /* Stop transfers. */ if (sc->aue_ep[AUE_ENDPT_RX] != NULL) { - usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_RX]); err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_RX]); if (err) { printf("%s: close rx pipe failed: %s\n", @@ -1528,7 +1527,6 @@ aue_stop(struct aue_softc *sc) } if (sc->aue_ep[AUE_ENDPT_TX] != NULL) { - usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_TX]); err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_TX]); if (err) { printf("%s: close tx pipe failed: %s\n", @@ -1538,7 +1536,6 @@ aue_stop(struct aue_softc *sc) } if (sc->aue_ep[AUE_ENDPT_INTR] != NULL) { - usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_INTR]); err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_INTR]); if (err) { printf("%s: close intr pipe failed: %s\n", |