From owner-svn-src-stable-10@freebsd.org  Sun Jun  5 15:03:56 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A1381B6AD87;
 Sun,  5 Jun 2016 15:03:56 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6407D1AA0;
 Sun,  5 Jun 2016 15:03:56 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u55F3tao039780;
 Sun, 5 Jun 2016 15:03:55 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u55F3tP8039779;
 Sun, 5 Jun 2016 15:03:55 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201606051503.u55F3tP8039779@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Sun, 5 Jun 2016 15:03:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r301446 - stable/10/sys/dev/usb/net
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2016 15:03:56 -0000

Author: pfg
Date: Sun Jun  5 15:03:55 2016
New Revision: 301446
URL: https://svnweb.freebsd.org/changeset/base/301446

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

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

Modified: stable/10/sys/dev/usb/net/uhso.c
==============================================================================
--- stable/10/sys/dev/usb/net/uhso.c	Sun Jun  5 14:31:36 2016	(r301445)
+++ stable/10/sys/dev/usb/net/uhso.c	Sun Jun  5 15:03:55 2016	(r301446)
@@ -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;
 	}
 }