svn commit: r301447 - stable/9/sys/dev/usb/net

[Pedro F. Giffuni]

Author: pfg
Date: Sun Jun  5 15:05:53 2016
New Revision: 301447
URL: https://svnweb.freebsd.org/changeset/base/301447

Log:
  MFC r301206:
  usb/uhso: Don't bail out on first USB error.
  
  CID:		1305680
  Submitted by:	hselasky
  MFC after:	3 days

Modified:
  stable/9/sys/dev/usb/net/uhso.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/net/uhso.c
==============================================================================
--- stable/9/sys/dev/usb/net/uhso.c	Sun Jun  5 15:03:55 2016	(r301446)
+++ stable/9/sys/dev/usb/net/uhso.c	Sun Jun  5 15:05:53 2016	(r301447)
@@ -1223,6 +1223,7 @@ uhso_mux_write_callback(struct usb_xfer 
 		    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 
 		UHSO_DPRINTF(0, "error: %s\n", usbd_errstr(error));
 		if (error == USB_ERR_CANCELLED)
 			break;
-		break;
+		usbd_xfer_set_stall(xfer);
+		goto tr_setup;
 	}
 }