=== ./xhci.c
==================================================================
--- ./xhci.c	(revision 271878)
+++ ./xhci.c	(local)
@@ -3805,7 +3805,17 @@
 	 * Get the endpoint into the running state according to the
 	 * endpoint context state diagram in the XHCI specification:
 	 */
+	if (epno > 1) {
+		/* need to disable endpoint context first */
 
+		xhci_configure_mask(udev, (1U << epno), 1);
+
+		err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
+
+		if (err != 0)
+			DPRINTF("Could not configure endpoint %u\n", epno);
+	}
+
 	xhci_configure_mask(udev, (1U << epno) | 1U, 0);
 
 	err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);