From 7c6717802eef475e51b3590ca996146a26054cac Mon Sep 17 00:00:00 2001 From: pfg Date: Sun, 5 Jun 2016 15:03:55 +0000 Subject: [PATCH] MFC r301206: usb/uhso: Don't bail out on first USB error. CID: 1305680 Submitted by: hselasky MFC after: 3 days git-svn-id: svn://svn.freebsd.org/base/stable/10@301446 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/usb/net/uhso.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c index 17959935f..e61458239 100644 --- a/sys/dev/usb/net/uhso.c +++ b/sys/dev/usb/net/uhso.c @@ -1223,6 +1223,7 @@ uhso_mux_write_callback(struct usb_xfer *xfer, usb_error_t error) ht->ht_muxport); /* FALLTHROUGH */ case USB_ST_SETUP: +tr_setup: pc = usbd_xfer_get_frame(xfer, 1); if (ucom_get_data(&sc->sc_ucom[ht->ht_muxport], pc, 0, 32, &actlen)) { @@ -1253,7 +1254,8 @@ uhso_mux_write_callback(struct usb_xfer *xfer, usb_error_t error) UHSO_DPRINTF(0, "error: %s\n", usbd_errstr(error)); if (error == USB_ERR_CANCELLED) break; - break; + usbd_xfer_set_stall(xfer); + goto tr_setup; } } -- 2.45.0