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@

50 files changed, 67 insertions, 200 deletions

diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 2aa459ecc5d..87f4dcdc587 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.131 2020/07/10 13:26:40 patrick Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.132 2020/07/31 10:49:32 mglocker Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -2252,7 +2252,6 @@ atu_stop(struct ifnet *ifp, int disable)
 
 	/* Stop transfers. */
 	if (sc->atu_ep[ATU_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->atu_ep[ATU_ENDPT_RX]);
 		err = usbd_close_pipe(sc->atu_ep[ATU_ENDPT_RX]);
 		if (err) {
 			DPRINTF(("%s: close rx pipe failed: %s\n",
@@ -2262,7 +2261,6 @@ atu_stop(struct ifnet *ifp, int disable)
 	}
 
 	if (sc->atu_ep[ATU_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->atu_ep[ATU_ENDPT_TX]);
 		err = usbd_close_pipe(sc->atu_ep[ATU_ENDPT_TX]);
 		if (err) {
 			DPRINTF(("%s: close tx pipe failed: %s\n",
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",
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 589500fdc21..c58406b7dfe 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.141 2020/07/10 13:26:40 patrick Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.142 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -1473,7 +1473,6 @@ axe_stop(struct axe_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->axe_ep[AXE_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_RX]);
 		err = usbd_close_pipe(sc->axe_ep[AXE_ENDPT_RX]);
 		if (err) {
 			printf("axe%d: close rx pipe failed: %s\n",
@@ -1483,7 +1482,6 @@ axe_stop(struct axe_softc *sc)
 	}
 
 	if (sc->axe_ep[AXE_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_TX]);
 		err = usbd_close_pipe(sc->axe_ep[AXE_ENDPT_TX]);
 		if (err) {
 			printf("axe%d: close tx pipe failed: %s\n",
@@ -1493,7 +1491,6 @@ axe_stop(struct axe_softc *sc)
 	}
 
 	if (sc->axe_ep[AXE_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->axe_ep[AXE_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->axe_ep[AXE_ENDPT_INTR]);
 		if (err) {
 			printf("axe%d: close intr pipe failed: %s\n",
diff --git a/sys/dev/usb/if_axen.c b/sys/dev/usb/if_axen.c
index 7cad3ef7efb..d0329d308f5 100644
--- a/sys/dev/usb/if_axen.c
+++ b/sys/dev/usb/if_axen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axen.c,v 1.29 2020/07/10 13:26:40 patrick Exp $	*/
+/*	$OpenBSD: if_axen.c,v 1.30 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>
@@ -1426,7 +1426,6 @@ axen_stop(struct axen_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->axen_ep[AXEN_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_RX]);
 		err = usbd_close_pipe(sc->axen_ep[AXEN_ENDPT_RX]);
 		if (err) {
 			printf("axen%d: close rx pipe failed: %s\n",
@@ -1436,7 +1435,6 @@ axen_stop(struct axen_softc *sc)
 	}
 
 	if (sc->axen_ep[AXEN_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_TX]);
 		err = usbd_close_pipe(sc->axen_ep[AXEN_ENDPT_TX]);
 		if (err) {
 			printf("axen%d: close tx pipe failed: %s\n",
@@ -1446,7 +1444,6 @@ axen_stop(struct axen_softc *sc)
 	}
 
 	if (sc->axen_ep[AXEN_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->axen_ep[AXEN_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->axen_ep[AXEN_ENDPT_INTR]);
 		if (err) {
 			printf("axen%d: close intr pipe failed: %s\n",
diff --git a/sys/dev/usb/if_bwfm_usb.c b/sys/dev/usb/if_bwfm_usb.c
index 4a0cc47503f..5df615156f0 100644
--- a/sys/dev/usb/if_bwfm_usb.c
+++ b/sys/dev/usb/if_bwfm_usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bwfm_usb.c,v 1.18 2020/02/25 14:24:58 patrick Exp $ */
+/* $OpenBSD: if_bwfm_usb.c,v 1.19 2020/07/31 10:49:32 mglocker Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
  * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
@@ -414,12 +414,10 @@ bwfm_usb_preinit(struct bwfm_softc *bwfm)
 
 cleanup:
 	if (sc->sc_rx_pipeh) {
-		usbd_abort_pipe(sc->sc_rx_pipeh);
 		usbd_close_pipe(sc->sc_rx_pipeh);
 		sc->sc_rx_pipeh = NULL;
 	}
 	if (sc->sc_tx_pipeh) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
 		usbd_close_pipe(sc->sc_tx_pipeh);
 		sc->sc_tx_pipeh = NULL;
 	}
@@ -626,14 +624,10 @@ bwfm_usb_detach(struct device *self, int flags)
 
 	bwfm_detach(&sc->sc_sc, flags);
 
-	if (sc->sc_rx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_rx_pipeh);
+	if (sc->sc_rx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_rx_pipeh);
-	}
-	if (sc->sc_tx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
+	if (sc->sc_tx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_tx_pipeh);
-	}
 
 	bwfm_usb_free_rx_list(sc);
 	bwfm_usb_free_tx_list(sc);
@@ -743,7 +737,6 @@ bwfm_usb_load_microcode(struct bwfm_usb_softc *sc, const u_char *ucode, size_t s
 	return 0;
 err:
 	if (sc->sc_tx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
 		usbd_close_pipe(sc->sc_tx_pipeh);
 		sc->sc_tx_pipeh = NULL;
 	}
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 9f4a104075a..0b819952e1f 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdce.c,v 1.78 2020/07/10 13:26:40 patrick Exp $ */
+/*	$OpenBSD: if_cdce.c,v 1.79 2020/07/31 10:49:32 mglocker Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -442,7 +442,6 @@ cdce_stop(struct cdce_softc *sc)
 	ifq_clr_oactive(&ifp->if_snd);
 
 	if (sc->cdce_bulkin_pipe != NULL) {
-		usbd_abort_pipe(sc->cdce_bulkin_pipe);
 		err = usbd_close_pipe(sc->cdce_bulkin_pipe);
 		if (err)
 			printf("%s: close rx pipe failed: %s\n",
@@ -451,7 +450,6 @@ cdce_stop(struct cdce_softc *sc)
 	}
 
 	if (sc->cdce_bulkout_pipe != NULL) {
-		usbd_abort_pipe(sc->cdce_bulkout_pipe);
 		err = usbd_close_pipe(sc->cdce_bulkout_pipe);
 		if (err)
 			printf("%s: close tx pipe failed: %s\n",
@@ -460,7 +458,6 @@ cdce_stop(struct cdce_softc *sc)
 	}
 
 	if (sc->cdce_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->cdce_intr_pipe);
 		err = usbd_close_pipe(sc->cdce_intr_pipe);
 		if (err)
 			printf("%s: close interrupt pipe failed: %s\n",
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 82a35598f38..5618414022b 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.79 2020/07/10 13:26:40 patrick Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.80 2020/07/31 10:49:32 mglocker Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1129,7 +1129,6 @@ cue_stop(struct cue_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->cue_ep[CUE_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_RX]);
 		err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
@@ -1139,7 +1138,6 @@ cue_stop(struct cue_softc *sc)
 	}
 
 	if (sc->cue_ep[CUE_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_TX]);
 		err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
@@ -1149,7 +1147,6 @@ cue_stop(struct cue_softc *sc)
 	}
 
 	if (sc->cue_ep[CUE_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->cue_ep[CUE_ENDPT_INTR]);
 		if (err) {
 			printf("%s: close intr pipe failed: %s\n",
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 0471eb8b9d6..5b09c42a6d2 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.91 2020/07/10 13:26:40 patrick Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.92 2020/07/31 10:49:32 mglocker Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -1098,7 +1098,6 @@ kue_stop(struct kue_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->kue_ep[KUE_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_RX]);
 		err = usbd_close_pipe(sc->kue_ep[KUE_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
@@ -1108,7 +1107,6 @@ kue_stop(struct kue_softc *sc)
 	}
 
 	if (sc->kue_ep[KUE_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_TX]);
 		err = usbd_close_pipe(sc->kue_ep[KUE_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
@@ -1118,7 +1116,6 @@ kue_stop(struct kue_softc *sc)
 	}
 
 	if (sc->kue_ep[KUE_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->kue_ep[KUE_ENDPT_INTR]);
 		if (err) {
 			printf("%s: close intr pipe failed: %s\n",
diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c
index c84e10e2452..f7cf57fe39f 100644
--- a/sys/dev/usb/if_mos.c
+++ b/sys/dev/usb/if_mos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mos.c,v 1.42 2020/07/10 13:26:40 patrick Exp $	*/
+/*	$OpenBSD: if_mos.c,v 1.43 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@@ -1334,7 +1334,6 @@ mos_stop(struct mos_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->mos_ep[MOS_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_RX]);
 		err = usbd_close_pipe(sc->mos_ep[MOS_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
@@ -1344,7 +1343,6 @@ mos_stop(struct mos_softc *sc)
 	}
 
 	if (sc->mos_ep[MOS_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_TX]);
 		err = usbd_close_pipe(sc->mos_ep[MOS_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
@@ -1354,7 +1352,6 @@ mos_stop(struct mos_softc *sc)
 	}
 
 	if (sc->mos_ep[MOS_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->mos_ep[MOS_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->mos_ep[MOS_ENDPT_INTR]);
 		if (err) {
 			printf("%s: close intr pipe failed: %s\n",
diff --git a/sys/dev/usb/if_mue.c b/sys/dev/usb/if_mue.c
index 0ba5571649c..2ae0e7b8a3c 100644
--- a/sys/dev/usb/if_mue.c
+++ b/sys/dev/usb/if_mue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mue.c,v 1.9 2020/07/10 13:26:40 patrick Exp $	*/
+/*	$OpenBSD: if_mue.c,v 1.10 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2018 Kevin Lo <kevlo@openbsd.org>
@@ -1347,7 +1347,6 @@ mue_stop(struct mue_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->mue_ep[MUE_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->mue_ep[MUE_ENDPT_RX]);
 		err = usbd_close_pipe(sc->mue_ep[MUE_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
@@ -1357,7 +1356,6 @@ mue_stop(struct mue_softc *sc)
 	}
 
 	if (sc->mue_ep[MUE_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->mue_ep[MUE_ENDPT_TX]);
 		err = usbd_close_pipe(sc->mue_ep[MUE_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
@@ -1367,7 +1365,6 @@ mue_stop(struct mue_softc *sc)
 	}
 
 	if (sc->mue_ep[MUE_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->mue_ep[MUE_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->mue_ep[MUE_ENDPT_INTR]);
 		if (err) {
 			printf("%s: close intr pipe failed: %s\n",
diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c
index 112676c139f..0517a00e51a 100644
--- a/sys/dev/usb/if_otus.c
+++ b/sys/dev/usb/if_otus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_otus.c,v 1.66 2020/07/10 13:22:21 patrick Exp $	*/
+/*	$OpenBSD: if_otus.c,v 1.67 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -555,10 +555,8 @@ otus_close_pipes(struct otus_softc *sc)
 
 	if (sc->data_rx_pipe != NULL)
 		usbd_close_pipe(sc->data_rx_pipe);
-	if (sc->cmd_rx_pipe != NULL) {
-		usbd_abort_pipe(sc->cmd_rx_pipe);
+	if (sc->cmd_rx_pipe != NULL)
 		usbd_close_pipe(sc->cmd_rx_pipe);
-	}
 	if (sc->ibuf != NULL)
 		free(sc->ibuf, M_USBDEV, sc->ibuflen);
 	if (sc->data_tx_pipe != NULL)
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index f1f2d0e4471..fc000d55ad2 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.147 2020/07/10 13:22:21 patrick Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.148 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -348,15 +348,11 @@ ural_detach(struct device *self, int flags)
 		sc->amrr_xfer = NULL;
 	}
 
-	if (sc->sc_rx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_rx_pipeh);
+	if (sc->sc_rx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_rx_pipeh);
-	}
 
-	if (sc->sc_tx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
+	if (sc->sc_tx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_tx_pipeh);
-	}
 
 	ural_free_rx_list(sc);
 	ural_free_tx_list(sc);
@@ -2067,12 +2063,10 @@ ural_stop(struct ifnet *ifp, int disable)
 		sc->amrr_xfer = NULL;
 	}
 	if (sc->sc_rx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_rx_pipeh);
 		usbd_close_pipe(sc->sc_rx_pipeh);
 		sc->sc_rx_pipeh = NULL;
 	}
 	if (sc->sc_tx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
 		usbd_close_pipe(sc->sc_tx_pipeh);
 		sc->sc_tx_pipeh = NULL;
 	}
diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c
index 94f41d623a5..1d9e4975133 100644
--- a/sys/dev/usb/if_rsu.c
+++ b/sys/dev/usb/if_rsu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rsu.c,v 1.46 2020/07/10 13:22:21 patrick Exp $	*/
+/*	$OpenBSD: if_rsu.c,v 1.47 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -381,7 +381,6 @@ rsu_close_pipes(struct rsu_softc *sc)
 	for (i = 0; i < sc->npipes; i++) {
 		if (sc->pipe[i] == NULL)
 			continue;
-		usbd_abort_pipe(sc->pipe[i]);
 		usbd_close_pipe(sc->pipe[i]);
 	}
 }
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index 1dada2fd1db..1a0152a80f1 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.125 2020/07/10 13:22:21 patrick Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.126 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -441,14 +441,10 @@ rum_detach(struct device *self, int flags)
 		usbd_free_xfer(sc->amrr_xfer);
 		sc->amrr_xfer = NULL;
 	}
-	if (sc->sc_rx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_rx_pipeh);
+	if (sc->sc_rx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_rx_pipeh);
-	}
-	if (sc->sc_tx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
+	if (sc->sc_tx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_tx_pipeh);
-	}
 
 	rum_free_rx_list(sc);
 	rum_free_tx_list(sc);
@@ -2091,12 +2087,10 @@ rum_stop(struct ifnet *ifp, int disable)
 		sc->amrr_xfer = NULL;
 	}
 	if (sc->sc_rx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_rx_pipeh);
 		usbd_close_pipe(sc->sc_rx_pipeh);
 		sc->sc_rx_pipeh = NULL;
 	}
 	if (sc->sc_tx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
 		usbd_close_pipe(sc->sc_tx_pipeh);
 		sc->sc_tx_pipeh = NULL;
 	}
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index 76f4d1f42d6..122113f60a7 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.129 2020/07/10 13:22:21 patrick Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.130 2020/07/31 10:49:32 mglocker Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -750,7 +750,6 @@ run_free_rx_ring(struct run_softc *sc)
 	int i;
 
 	if (rxq->pipeh != NULL) {
-		usbd_abort_pipe(rxq->pipeh);
 		usbd_close_pipe(rxq->pipeh);
 		rxq->pipeh = NULL;
 	}
@@ -809,7 +808,6 @@ run_free_tx_ring(struct run_softc *sc, int qid)
 	int i;
 
 	if (txq->pipeh != NULL) {
-		usbd_abort_pipe(txq->pipeh);
 		usbd_close_pipe(txq->pipeh);
 		txq->pipeh = NULL;
 	}
diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c
index f81da3b7023..ff59a0276cb 100644
--- a/sys/dev/usb/if_smsc.c
+++ b/sys/dev/usb/if_smsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_smsc.c,v 1.36 2020/07/10 13:26:40 patrick Exp $	*/
+/*	$OpenBSD: if_smsc.c,v 1.37 2020/07/31 10:49:32 mglocker Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
 /*-
  * Copyright (c) 2012
@@ -698,7 +698,6 @@ smsc_stop(struct smsc_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->sc_ep[SMSC_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_RX]);
 		err = usbd_close_pipe(sc->sc_ep[SMSC_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
@@ -708,7 +707,6 @@ smsc_stop(struct smsc_softc *sc)
 	}
 
 	if (sc->sc_ep[SMSC_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_TX]);
 		err = usbd_close_pipe(sc->sc_ep[SMSC_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
@@ -718,7 +716,6 @@ smsc_stop(struct smsc_softc *sc)
 	}
 
 	if (sc->sc_ep[SMSC_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[SMSC_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->sc_ep[SMSC_ENDPT_INTR]);
 		if (err) {
 			printf("%s: close intr pipe failed: %s\n",
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 04fa3843b85..d2a9cba551f 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.83 2020/07/10 13:26:41 patrick Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.84 2020/07/31 10:49:32 mglocker Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -1226,7 +1226,6 @@ udav_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",
@@ -1236,7 +1235,6 @@ udav_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",
@@ -1248,7 +1246,6 @@ udav_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",
diff --git a/sys/dev/usb/if_ugl.c b/sys/dev/usb/if_ugl.c
index 2d13eb66152..73fa329987c 100644
--- a/sys/dev/usb/if_ugl.c
+++ b/sys/dev/usb/if_ugl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ugl.c,v 1.25 2020/07/10 13:26:41 patrick Exp $	*/
+/*	$OpenBSD: if_ugl.c,v 1.26 2020/07/31 10:49:32 mglocker Exp $	*/
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk>
@@ -817,19 +817,16 @@ ugl_stop(struct ugl_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->sc_ep[UGL_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[UGL_ENDPT_RX]);
 		usbd_close_pipe(sc->sc_ep[UGL_ENDPT_RX]);
 		sc->sc_ep[UGL_ENDPT_RX] = NULL;
 	}
 
 	if (sc->sc_ep[UGL_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[UGL_ENDPT_TX]);
 		usbd_close_pipe(sc->sc_ep[UGL_ENDPT_TX]);
 		sc->sc_ep[UGL_ENDPT_TX] = NULL;
 	}
 
 	if (sc->sc_ep[UGL_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[UGL_ENDPT_INTR]);
 		usbd_close_pipe(sc->sc_ep[UGL_ENDPT_INTR]);
 		sc->sc_ep[UGL_ENDPT_INTR] = NULL;
 	}
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c
index 493cfe787f8..eb15c659dff 100644
--- a/sys/dev/usb/if_upgt.c
+++ b/sys/dev/usb/if_upgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upgt.c,v 1.86 2020/07/10 13:22:21 patrick Exp $ */
+/*	$OpenBSD: if_upgt.c,v 1.87 2020/07/31 10:49:32 mglocker Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -447,14 +447,10 @@ upgt_detach(struct device *self, int flags)
 	s = splusb();
 
 	/* abort and close TX / RX pipes */
-	if (sc->sc_tx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
+	if (sc->sc_tx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_tx_pipeh);
-	}
-	if (sc->sc_rx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_rx_pipeh);
+	if (sc->sc_rx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_rx_pipeh);
-	}
 
 	/* remove tasks and timeouts */
 	usb_rem_task(sc->sc_udev, &sc->sc_task_newstate);
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 4f02533dfae..f095d8d598c 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.77 2020/07/10 13:26:41 patrick Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.78 2020/07/31 10:49:32 mglocker Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -819,7 +819,6 @@ upl_stop(struct upl_softc *sc)
 
 	/* Stop transfers. */
 	if (sc->sc_ep[UPL_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[UPL_ENDPT_RX]);
 		err = usbd_close_pipe(sc->sc_ep[UPL_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
@@ -829,7 +828,6 @@ upl_stop(struct upl_softc *sc)
 	}
 
 	if (sc->sc_ep[UPL_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[UPL_ENDPT_TX]);
 		err = usbd_close_pipe(sc->sc_ep[UPL_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
@@ -839,7 +837,6 @@ upl_stop(struct upl_softc *sc)
 	}
 
 	if (sc->sc_ep[UPL_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->sc_ep[UPL_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->sc_ep[UPL_ENDPT_INTR]);
 		if (err) {
 			printf("%s: close intr pipe failed: %s\n",
diff --git a/sys/dev/usb/if_ure.c b/sys/dev/usb/if_ure.c
index 5fb20d9c741..38cb514b350 100644
--- a/sys/dev/usb/if_ure.c
+++ b/sys/dev/usb/if_ure.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ure.c,v 1.16 2020/07/10 13:26:41 patrick Exp $	*/
+/*	$OpenBSD: if_ure.c,v 1.17 2020/07/31 10:49:33 mglocker Exp $	*/
 /*-
  * Copyright (c) 2015, 2016, 2019 Kevin Lo <kevlo@openbsd.org>
  * All rights reserved.
@@ -825,7 +825,6 @@ ure_stop(struct ure_softc *sc)
 	sc->ure_flags &= ~URE_FLAG_LINK;
 
 	if (sc->ure_ep[URE_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->ure_ep[URE_ENDPT_RX]);
 		err = usbd_close_pipe(sc->ure_ep[URE_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
@@ -835,7 +834,6 @@ ure_stop(struct ure_softc *sc)
 	}
 
 	if (sc->ure_ep[URE_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->ure_ep[URE_ENDPT_TX]);
 		err = usbd_close_pipe(sc->ure_ep[URE_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
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",
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c
index de7038fc9b7..a019d34fd19 100644
--- a/sys/dev/usb/if_urndis.c
+++ b/sys/dev/usb/if_urndis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urndis.c,v 1.71 2020/07/10 13:26:41 patrick Exp $ */
+/*	$OpenBSD: if_urndis.c,v 1.72 2020/07/31 10:49:33 mglocker Exp $ */
 
 /*
  * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
@@ -1140,7 +1140,6 @@ urndis_stop(struct urndis_softc *sc)
 	ifq_clr_oactive(&ifp->if_snd);
 
 	if (sc->sc_bulkin_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkin_pipe);
 		err = usbd_close_pipe(sc->sc_bulkin_pipe);
 		if (err)
 			printf("%s: close rx pipe failed: %s\n",
@@ -1149,7 +1148,6 @@ urndis_stop(struct urndis_softc *sc)
 	}
 
 	if (sc->sc_bulkout_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkout_pipe);
 		err = usbd_close_pipe(sc->sc_bulkout_pipe);
 		if (err)
 			printf("%s: close tx pipe failed: %s\n",
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index 4238d3a44d0..3a499073d60 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.92 2020/07/06 10:38:54 jsg Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.93 2020/07/31 10:49:33 mglocker Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -615,15 +615,12 @@ urtwn_close_pipes(struct urtwn_softc *sc)
 	int i;
 
 	/* Close Rx pipe. */
-	if (sc->rx_pipe != NULL) {
-		usbd_abort_pipe(sc->rx_pipe);
+	if (sc->rx_pipe != NULL)
 		usbd_close_pipe(sc->rx_pipe);
-	}
 	/* Close Tx pipes. */
 	for (i = 0; i < R92C_MAX_EPOUT; i++) {
 		if (sc->tx_pipe[i] == NULL)
 			continue;
-		usbd_abort_pipe(sc->tx_pipe[i]);
 		usbd_close_pipe(sc->tx_pipe[i]);
 	}
 }
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index b477bc1ff2f..359b4b77e2c 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_usb.c,v 1.72 2020/07/10 13:26:41 patrick Exp $ */
+/*	$OpenBSD: if_wi_usb.c,v 1.73 2020/07/31 10:49:33 mglocker Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -416,7 +416,6 @@ wi_usb_detach(struct device *self, int flags)
 	}
 
 	if (sc->wi_usb_ep[WI_USB_ENDPT_INTR] != NULL) {
-		usbd_abort_pipe(sc->wi_usb_ep[WI_USB_ENDPT_INTR]);
 		err = usbd_close_pipe(sc->wi_usb_ep[WI_USB_ENDPT_INTR]);
 		if (err) {
 			printf("%s: close intr pipe failed: %s\n",
@@ -425,7 +424,6 @@ wi_usb_detach(struct device *self, int flags)
 		sc->wi_usb_ep[WI_USB_ENDPT_INTR] = NULL;
 	}
 	if (sc->wi_usb_ep[WI_USB_ENDPT_TX] != NULL) {
-		usbd_abort_pipe(sc->wi_usb_ep[WI_USB_ENDPT_TX]);
 		err = usbd_close_pipe(sc->wi_usb_ep[WI_USB_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
@@ -434,7 +432,6 @@ wi_usb_detach(struct device *self, int flags)
 		sc->wi_usb_ep[WI_USB_ENDPT_TX] = NULL;
 	}
 	if (sc->wi_usb_ep[WI_USB_ENDPT_RX] != NULL) {
-		usbd_abort_pipe(sc->wi_usb_ep[WI_USB_ENDPT_RX]);
 		err = usbd_close_pipe(sc->wi_usb_ep[WI_USB_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index d2a1f89d009..8194f253887 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.124 2020/07/10 13:22:21 patrick Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.125 2020/07/31 10:49:33 mglocker Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -518,7 +518,6 @@ zyd_close_pipes(struct zyd_softc *sc)
 
 	for (i = 0; i < ZYD_ENDPT_CNT; i++) {
 		if (sc->zyd_ep[i] != NULL) {
-			usbd_abort_pipe(sc->zyd_ep[i]);
 			usbd_close_pipe(sc->zyd_ep[i]);
 			sc->zyd_ep[i] = NULL;
 		}
diff --git a/sys/dev/usb/ubcmtp.c b/sys/dev/usb/ubcmtp.c
index 2c30584d5b7..6b5c7f65c99 100644
--- a/sys/dev/usb/ubcmtp.c
+++ b/sys/dev/usb/ubcmtp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubcmtp.c,v 1.20 2019/05/27 15:50:26 jcs Exp $ */
+/*	$OpenBSD: ubcmtp.c,v 1.21 2020/07/31 10:49:33 mglocker Exp $ */
 
 /*
  * Copyright (c) 2013-2014, joshua stein <jcs@openbsd.org>
@@ -583,12 +583,10 @@ ubcmtp_disable(void *v)
 	ubcmtp_raw_mode(sc, 0);
 
 	if (sc->sc_tp_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_tp_pipe);
 		usbd_close_pipe(sc->sc_tp_pipe);
 		sc->sc_tp_pipe = NULL;
 	}
 	if (sc->sc_bt_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bt_pipe);
 		usbd_close_pipe(sc->sc_bt_pipe);
 		sc->sc_bt_pipe = NULL;
 	}
@@ -773,17 +771,13 @@ ubcmtp_setup_pipes(struct ubcmtp_softc *sc)
 	return (0);
 
 fail2:
-	if (sc->sc_tp_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_tp_pipe);
+	if (sc->sc_tp_pipe != NULL)
 		usbd_close_pipe(sc->sc_tp_pipe);
-	}
 	if (sc->tp_pkt != NULL)
 		free(sc->tp_pkt, M_USBDEV, sc->tp_maxlen);
 fail1:
-	if (sc->sc_bt_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bt_pipe);
+	if (sc->sc_bt_pipe != NULL)
 		usbd_close_pipe(sc->sc_bt_pipe);
-	}
 	if (sc->bt_pkt != NULL)
 		free(sc->bt_pkt, M_USBDEV, sc->bt_maxlen);
 
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index d1c71db4f57..1ca8871433d 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.66 2018/04/27 08:08:06 guenther Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.67 2020/07/31 10:49:33 mglocker Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -367,7 +367,6 @@ ubsa_detach(struct device *self, int flags)
 	DPRINTF(("ubsa_detach: sc = %p\n", sc));
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		usbd_close_pipe(sc->sc_intr_pipe);
 		free(sc->sc_intr_buf, M_USBDEV, sc->sc_isize);
 		sc->sc_intr_pipe = NULL;
@@ -621,7 +620,6 @@ ubsa_close(void *addr, int portno)
 	DPRINTF(("ubsa_close: close\n"));
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		err = usbd_close_pipe(sc->sc_intr_pipe);
 		if (err)
 			printf("%s: close interrupt pipe failed: %s\n",
diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c
index afd1ec0c951..a9dc1f730ac 100644
--- a/sys/dev/usb/uchcom.c
+++ b/sys/dev/usb/uchcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uchcom.c,v 1.27 2017/04/08 02:57:25 deraadt Exp $	*/
+/*	$OpenBSD: uchcom.c,v 1.28 2020/07/31 10:49:33 mglocker Exp $	*/
 /*	$NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $	*/
 
 /*
@@ -794,7 +794,6 @@ uchcom_close_intr_pipe(struct uchcom_softc *sc)
 	usbd_status err;
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		err = usbd_close_pipe(sc->sc_intr_pipe);
 		if (err)
 			printf("%s: close interrupt pipe failed: %s\n",
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 74e986a774e..8a4482fac9b 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucom.c,v 1.70 2020/03/08 19:24:15 claudio Exp $ */
+/*	$OpenBSD: ucom.c,v 1.71 2020/07/31 10:49:33 mglocker Exp $ */
 /*	$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $	*/
 
 /*
@@ -217,12 +217,10 @@ ucom_detach(struct device *self, int flags)
 		 sc, flags, tp, sc->sc_bulkin_no, sc->sc_bulkout_no));
 
 	if (sc->sc_bulkin_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkin_pipe);
 		usbd_close_pipe(sc->sc_bulkin_pipe);
 		sc->sc_bulkin_pipe = NULL;
 	}
 	if (sc->sc_bulkout_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkout_pipe);
 		usbd_close_pipe(sc->sc_bulkout_pipe);
 		sc->sc_bulkout_pipe = NULL;
 	}
@@ -1196,12 +1194,10 @@ ucom_cleanup(struct ucom_softc *sc)
 
 	ucom_shutdown(sc);
 	if (sc->sc_bulkin_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkin_pipe);
 		usbd_close_pipe(sc->sc_bulkin_pipe);
 		sc->sc_bulkin_pipe = NULL;
 	}
 	if (sc->sc_bulkout_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkout_pipe);
 		usbd_close_pipe(sc->sc_bulkout_pipe);
 		sc->sc_bulkout_pipe = NULL;
 	}
diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c
index d1b061baeb0..30a5dd2de87 100644
--- a/sys/dev/usb/udl.c
+++ b/sys/dev/usb/udl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udl.c,v 1.93 2020/05/25 09:55:49 jsg Exp $ */
+/*	$OpenBSD: udl.c,v 1.94 2020/07/31 10:49:33 mglocker Exp $ */
 
 /*
  * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -438,10 +438,8 @@ udl_detach(struct device *self, int flags)
 	/*
 	 * Close bulk TX pipe.
 	 */
-	if (sc->sc_tx_pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_tx_pipeh);
+	if (sc->sc_tx_pipeh != NULL)
 		usbd_close_pipe(sc->sc_tx_pipeh);
-	}
 
 	/*
 	 * Free command buffer.
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index ae11059e38b..6754d798661 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.c,v 1.79 2020/02/22 14:01:34 jasper Exp $	*/
+/*	$OpenBSD: uhidev.c,v 1.80 2020/07/31 10:49:33 mglocker Exp $	*/
 /*	$NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -394,13 +394,11 @@ uhidev_detach(struct device *self, int flags)
 	DPRINTF(("uhidev_detach: sc=%p flags=%d\n", sc, flags));
 
 	if (sc->sc_opipe != NULL) {
-		usbd_abort_pipe(sc->sc_opipe);
 		usbd_close_pipe(sc->sc_opipe);
 		sc->sc_opipe = NULL;
 	}
 
 	if (sc->sc_ipipe != NULL) {
-		usbd_abort_pipe(sc->sc_ipipe);
 		usbd_close_pipe(sc->sc_ipipe);
 		sc->sc_ipipe = NULL;
 	}
@@ -608,13 +606,11 @@ uhidev_close(struct uhidev *scd)
 
 	/* Disable interrupts. */
 	if (sc->sc_opipe != NULL) {
-		usbd_abort_pipe(sc->sc_opipe);
 		usbd_close_pipe(sc->sc_opipe);
 		sc->sc_opipe = NULL;
 	}
 
 	if (sc->sc_ipipe != NULL) {
-		usbd_abort_pipe(sc->sc_ipipe);
 		usbd_close_pipe(sc->sc_ipipe);
 		sc->sc_ipipe = NULL;
 	}
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++) {
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index ff42cddb97e..db8a44ab94d 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulpt.c,v 1.56 2020/01/08 12:57:35 mpi Exp $ */
+/*	$OpenBSD: ulpt.c,v 1.57 2020/07/31 10:49:33 mglocker Exp $ */
 /*	$NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $	*/
 
@@ -575,7 +575,6 @@ ulptclose(dev_t dev, int flag, int mode, struct proc *p)
 		sc->sc_out_pipe = NULL;
 	}
 	if (sc->sc_in_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_in_pipe);
 		usbd_close_pipe(sc->sc_in_pipe);
 		sc->sc_in_pipe = NULL;
 		if (sc->sc_in_xfer1 != NULL) {
diff --git a/sys/dev/usb/umbg.c b/sys/dev/usb/umbg.c
index debab3e7c81..3656090633f 100644
--- a/sys/dev/usb/umbg.c
+++ b/sys/dev/usb/umbg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umbg.c,v 1.26 2019/03/22 12:04:25 sthen Exp $ */
+/*	$OpenBSD: umbg.c,v 1.27 2020/07/31 10:49:33 mglocker Exp $ */
 
 /*
  * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -299,7 +299,6 @@ umbg_detach(struct device *self, int flags)
 	usb_rem_task(sc->sc_udev, &sc->sc_task);
 
 	if (sc->sc_bulkin_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkin_pipe);
 		err = usbd_close_pipe(sc->sc_bulkin_pipe);
 		if (err)
 			printf("%s: close rx pipe failed: %s\n",
@@ -307,7 +306,6 @@ umbg_detach(struct device *self, int flags)
 		sc->sc_bulkin_pipe = NULL;
 	}
 	if (sc->sc_bulkout_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_bulkout_pipe);
 		err = usbd_close_pipe(sc->sc_bulkout_pipe);
 		if (err)
 			printf("%s: close tx pipe failed: %s\n",
diff --git a/sys/dev/usb/umcs.c b/sys/dev/usb/umcs.c
index 9e5e67261a9..fd7427485ee 100644
--- a/sys/dev/usb/umcs.c
+++ b/sys/dev/usb/umcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umcs.c,v 1.7 2020/03/17 09:34:52 mpi Exp $ */
+/* $OpenBSD: umcs.c,v 1.8 2020/07/31 10:49:33 mglocker Exp $ */
 /* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */
 /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
 
@@ -471,7 +471,6 @@ umcs_detach(struct device *self, int flags)
 	task_del(systq, &sc->sc_status_task);
 
 	if (sc->sc_ipipe != NULL) {
-		usbd_abort_pipe(sc->sc_ipipe);
 		usbd_close_pipe(sc->sc_ipipe);
 		sc->sc_ipipe = NULL;
 	}
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index a6931c8e468..01a4301eadc 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.47 2017/12/30 20:47:00 guenther Exp $	*/
+/*	$OpenBSD: umct.c,v 1.48 2020/07/31 10:49:33 mglocker Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -295,7 +295,6 @@ umct_detach(struct device *self, int flags)
 	DPRINTF(("umct_detach: sc=%p flags=%d\n", sc, flags));
 
         if (sc->sc_intr_pipe != NULL) {
-                usbd_abort_pipe(sc->sc_intr_pipe);
                 usbd_close_pipe(sc->sc_intr_pipe);
 		free(sc->sc_intr_buf, M_USBDEV, sc->sc_isize);
                 sc->sc_intr_pipe = NULL;
@@ -552,7 +551,6 @@ umct_close(void *addr, int portno)
 	DPRINTF(("umct_close: close\n"));
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		err = usbd_close_pipe(sc->sc_intr_pipe);
 		if (err)
 			printf("%s: close interrupt pipe failed: %s\n",
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index f28d4ed46be..9d65d186427 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi.c,v 1.53 2020/03/16 16:12:43 jasper Exp $	*/
+/*	$OpenBSD: umidi.c,v 1.54 2020/07/31 10:49:33 mglocker Exp $	*/
 /*	$NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -367,7 +367,6 @@ static void
 free_pipe(struct umidi_endpoint *ep)
 {
 	DPRINTF(("%s: %s %p\n", ep->sc->sc_dev.dv_xname, __func__, ep));
-	usbd_abort_pipe(ep->pipe);
 	usbd_close_pipe(ep->pipe);
 	usbd_free_xfer(ep->xfer);
 }
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 25a1fa25f74..80e11abf576 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.65 2020/02/22 14:01:35 jasper Exp $ */
+/*	$OpenBSD: umodem.c,v 1.66 2020/07/31 10:49:33 mglocker Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -424,7 +424,6 @@ umodem_close(void *addr, int portno)
 	DPRINTF(("umodem_close: sc=%p\n", sc));
 
 	if (sc->sc_notify_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_notify_pipe);
 		err = usbd_close_pipe(sc->sc_notify_pipe);
 		if (err)
 			printf("%s: close notify pipe failed: %s\n",
@@ -702,7 +701,6 @@ umodem_detach(struct device *self, int flags)
 	DPRINTF(("umodem_detach: sc=%p flags=%d\n", sc, flags));
 
 	if (sc->sc_notify_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_notify_pipe);
 		usbd_close_pipe(sc->sc_notify_pipe);
 		sc->sc_notify_pipe = NULL;
 	}
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 0f6a8210999..a631f83485c 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.117 2020/02/05 16:01:32 deraadt Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.118 2020/07/31 10:49:33 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@@ -440,7 +440,6 @@ umsm_detach(struct device *self, int flags)
 
 	/* close the interrupt endpoint if that is opened */
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		usbd_close_pipe(sc->sc_intr_pipe);
 		free(sc->sc_intr_buf, M_USBDEV, sc->sc_isize);
 		sc->sc_intr_pipe = NULL;
@@ -496,7 +495,6 @@ umsm_close(void *addr, int portno)
 		return;
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		err = usbd_close_pipe(sc->sc_intr_pipe);
 		if (err)
 			printf("%s: close interrupt pipe failed: %s\n",
diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c
index f334103d616..299429170d9 100644
--- a/sys/dev/usb/uow.c
+++ b/sys/dev/usb/uow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uow.c,v 1.36 2020/01/04 11:36:05 mpi Exp $	*/
+/*	$OpenBSD: uow.c,v 1.37 2020/07/31 10:49:33 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -245,18 +245,12 @@ uow_detach(struct device *self, int flags)
 
 	s = splusb();
 
-	if (sc->sc_ph_ibulk != NULL) {
-		usbd_abort_pipe(sc->sc_ph_ibulk);
+	if (sc->sc_ph_ibulk != NULL)
 		usbd_close_pipe(sc->sc_ph_ibulk);
-	}
-	if (sc->sc_ph_obulk != NULL) {
-		usbd_abort_pipe(sc->sc_ph_obulk);
+	if (sc->sc_ph_obulk != NULL)
 		usbd_close_pipe(sc->sc_ph_obulk);
-	}
-	if (sc->sc_ph_intr != NULL) {
-		usbd_abort_pipe(sc->sc_ph_intr);
+	if (sc->sc_ph_intr != NULL)
 		usbd_close_pipe(sc->sc_ph_intr);
-	}
 
 	if (sc->sc_xfer_in != NULL)
 		usbd_free_xfer(sc->sc_xfer_in);
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 77d8476759f..fedbefe14c4 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.74 2020/03/11 13:04:02 jasper Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.75 2020/07/31 10:49:33 mglocker Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -399,7 +399,6 @@ uplcom_detach(struct device *self, int flags)
 	DPRINTF(("uplcom_detach: sc=%p flags=%d\n", sc, flags));
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		usbd_close_pipe(sc->sc_intr_pipe);
 		free(sc->sc_intr_buf, M_USBDEV, sc->sc_isize);
 		sc->sc_intr_pipe = NULL;
@@ -708,7 +707,6 @@ uplcom_close(void *addr, int portno)
 	DPRINTF(("uplcom_close: close\n"));
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		err = usbd_close_pipe(sc->sc_intr_pipe);
 		if (err)
 			printf("%s: close interrupt pipe failed: %s\n",
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 8cfe7ab8b63..3eb10ae4d16 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_subr.c,v 1.150 2019/10/06 17:11:51 mpi Exp $ */
+/*	$OpenBSD: usb_subr.c,v 1.151 2020/07/31 10:49:33 mglocker Exp $ */
 /*	$NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -1403,10 +1403,8 @@ usb_free_device(struct usbd_device *dev)
 
 	DPRINTF(("%s: %p\n", __func__, dev));
 
-	if (dev->default_pipe != NULL) {
-		usbd_abort_pipe(dev->default_pipe);
+	if (dev->default_pipe != NULL)
 		usbd_close_pipe(dev->default_pipe);
-	}
 	if (dev->ifaces != NULL) {
 		nifc = dev->cdesc->bNumInterface;
 		for (ifcidx = 0; ifcidx < nifc; ifcidx++)
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);
diff --git a/sys/dev/usb/uticom.c b/sys/dev/usb/uticom.c
index 010c85a0844..09889b43707 100644
--- a/sys/dev/usb/uticom.c
+++ b/sys/dev/usb/uticom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uticom.c,v 1.33 2018/03/15 00:42:41 kevlo Exp $	*/
+/*	$OpenBSD: uticom.c,v 1.34 2020/07/31 10:49:33 mglocker Exp $	*/
 /*
  * Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>.
  *
@@ -453,7 +453,6 @@ uticom_detach(struct device *self, int flags)
 	}
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		usbd_close_pipe(sc->sc_intr_pipe);
 		free(sc->sc_intr_buf, M_USBDEV, sc->sc_isize);
 		sc->sc_intr_pipe = NULL;
@@ -750,7 +749,6 @@ uticom_close(void *addr, int portno)
 	DPRINTF(("%s: uticom_close: close\n", sc->sc_dev.dv_xname));
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		err = usbd_close_pipe(sc->sc_intr_pipe);
 		if (err)
 			printf("%s: close interrupt pipe failed: %s\n",
@@ -912,7 +910,6 @@ finish:
 	usbd_free_buffer(oxfer);
 	usbd_free_xfer(oxfer);
 	oxfer = NULL;
-	usbd_abort_pipe(pipe);
 	usbd_close_pipe(pipe);
 	free(buffer, M_USBDEV, buffer_size);
 	return err;
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;
 	}
diff --git a/sys/dev/usb/utvfu.c b/sys/dev/usb/utvfu.c
index a6bfe683293..075372fe4ca 100644
--- a/sys/dev/usb/utvfu.c
+++ b/sys/dev/usb/utvfu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: utvfu.c,v 1.10 2019/10/14 09:20:48 mpi Exp $ */
+/*	$OpenBSD: utvfu.c,v 1.11 2020/07/31 10:49:33 mglocker Exp $ */
 /*
  * Copyright (c) 2013 Lubomir Rintel
  * Copyright (c) 2013 Federico Simoncelli
@@ -1164,7 +1164,6 @@ void
 utvfu_vs_close(struct utvfu_softc *sc)
 {
 	if (sc->sc_iface.pipeh != NULL) {
-		usbd_abort_pipe(sc->sc_iface.pipeh);
 		usbd_close_pipe(sc->sc_iface.pipeh);
 		sc->sc_iface.pipeh = NULL;
 	}
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 1c809012ec1..06cbfaf0d99 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvideo.c,v 1.208 2020/07/05 11:47:50 landry Exp $ */
+/*	$OpenBSD: uvideo.c,v 1.209 2020/07/31 10:49:33 mglocker Exp $ */
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -1970,7 +1970,6 @@ uvideo_vs_close(struct uvideo_softc *sc)
 	}
 
 	if (sc->sc_vs_cur->pipeh) {
-		usbd_abort_pipe(sc->sc_vs_cur->pipeh);
 		usbd_close_pipe(sc->sc_vs_cur->pipeh);
 		sc->sc_vs_cur->pipeh = NULL;
 	}
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index 0ab634b2584..65cd2d67e80 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvscom.c,v 1.38 2019/11/12 07:47:30 mpi Exp $ */
+/*	$OpenBSD: uvscom.c,v 1.39 2020/07/31 10:49:33 mglocker Exp $ */
 /*	$NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -351,7 +351,6 @@ uvscom_detach(struct device *self, int flags)
 	DPRINTF(("uvscom_detach: sc = %p\n", sc));
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		usbd_close_pipe(sc->sc_intr_pipe);
 		free(sc->sc_intr_buf, M_USBDEV, sc->sc_isize);
 		sc->sc_intr_pipe = NULL;
@@ -741,7 +740,6 @@ uvscom_close(void *addr, int portno)
 	uvscom_shutdown(sc);
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		err = usbd_close_pipe(sc->sc_intr_pipe);
 		if (err)
 			printf("%s: close interrupt pipe failed: %s\n",
diff --git a/sys/dev/usb/uxrcom.c b/sys/dev/usb/uxrcom.c
index 7ffacdd1d33..b0f4c6aafa6 100644
--- a/sys/dev/usb/uxrcom.c
+++ b/sys/dev/usb/uxrcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uxrcom.c,v 1.1 2019/03/27 22:08:51 kettenis Exp $	*/
+/*	$OpenBSD: uxrcom.c,v 1.2 2020/07/31 10:49:33 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -208,7 +208,6 @@ uxrcom_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;
 	}
@@ -247,7 +246,6 @@ uxrcom_close(void *vsc, int portno)
 		return;
 
 	if (sc->sc_intr_pipe != NULL) {
-		usbd_abort_pipe(sc->sc_intr_pipe);
 		err = usbd_close_pipe(sc->sc_intr_pipe);
 		if (err)
 			printf("%s: close intr pipe failed: %s\n",