From owner-p4-projects@FreeBSD.ORG  Wed Sep  9 18:42:34 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 76B351065679; Wed,  9 Sep 2009 18:42:34 +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 2F6CA106566C
	for <perforce@FreeBSD.org>; Wed,  9 Sep 2009 18:42:34 +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 1E6CC8FC08
	for <perforce@FreeBSD.org>; Wed,  9 Sep 2009 18:42:34 +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 n89IgYxX089838
	for <perforce@FreeBSD.org>; Wed, 9 Sep 2009 18:42:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n89IgXtg089836
	for perforce@freebsd.org; Wed, 9 Sep 2009 18:42:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 9 Sep 2009 18:42:33 GMT
Message-Id: <200909091842.n89IgXtg089836@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 168375 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:42:34 -0000

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

Change 168375 by hselasky@hselasky_laptop001 on 2009/09/09 18:42:20

	
	USB CORE:
	 - improve USB do_request code.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#27 edit

Differences ...

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

@@ -385,6 +385,7 @@
 	usb_ticks_t max_ticks;
 	uint16_t length;
 	uint16_t temp;
+	uint16_t acttemp;
 
 	if (timeout < 50) {
 		/* timeout is too small */
@@ -606,18 +607,19 @@
 		if (err) {
 			break;
 		}
-		/* subtract length of SETUP packet, if any */
+
+		/* get actual length of DATA stage */
 
-		if (xfer->aframes > 0) {
-			xfer->actlen -= usbd_xfer_frame_len(xfer, 0);
+		if (xfer->aframes < 2) {
+			acttemp = 0;
 		} else {
-			xfer->actlen = 0;
+			acttemp = usbd_xfer_frame_len(xfer, 1);
 		}
 
 		/* check for short packet */
 
-		if (temp > xfer->actlen) {
-			temp = xfer->actlen;
+		if (temp > acttemp) {
+			temp = acttemp;
 			length = temp;
 		}
 		if (temp > 0) {