From owner-p4-projects@FreeBSD.ORG  Wed Sep  9 18:46:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF81510656A7; Wed,  9 Sep 2009 18:46:38 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3C221065692
	for <perforce@FreeBSD.org>; Wed,  9 Sep 2009 18:46:38 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A2CB58FC18
	for <perforce@FreeBSD.org>; Wed,  9 Sep 2009 18:46:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n89IkcAS090130
	for <perforce@FreeBSD.org>; Wed, 9 Sep 2009 18:46:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n89Ikc91090128
	for perforce@freebsd.org; Wed, 9 Sep 2009 18:46:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 9 Sep 2009 18:46:38 GMT
Message-Id: <200909091846.n89Ikc91090128@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 168376 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Sep 2009 18:46:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=168376

Change 168376 by hselasky@hselasky_laptop001 on 2009/09/09 18:45:53

	
	USB CORE:
	 - Make sure the "control_act" flag is cleared in
	special usbd_transfer_stop/drain case. This fix
	only affect control endpoints, but not during
	normal operation. Only during error injection
	mode this fix makes a difference.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#165 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#165 (text+ko) ====

@@ -1332,7 +1332,9 @@
 	/* check if there is a length mismatch */
 
 	if (len > xfer->flags_int.control_rem) {
-		DPRINTFN(0, "Length greater than remaining length!\n");
+		DPRINTFN(0, "Length(%d) greater than "
+		    "remaining length(%d)!\n", len,
+		    xfer->flags_int.control_rem);
 		goto error;
 	}
 	/* check if we are doing a short transfer */
@@ -2190,6 +2192,8 @@
 	 */
 	if (!xfer->flags_int.transferring) {
 		DPRINTF("not transferring\n");
+		/* end of control transfer, if any */
+		xfer->flags_int.control_act = 0;
 		return;
 	}
 	/* only set transfer error if not already set */