From owner-p4-projects@FreeBSD.ORG  Sat Dec 22 13:43:01 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4643516A419; Sat, 22 Dec 2007 13:43:01 +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 F124316A469
	for <perforce@FreeBSD.org>; Sat, 22 Dec 2007 13:43:00 +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 F356413C46B
	for <perforce@FreeBSD.org>; Sat, 22 Dec 2007 13:43:00 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBMDh0PK073427
	for <perforce@FreeBSD.org>; Sat, 22 Dec 2007 13:43:00 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBMDh0GR073419
	for perforce@freebsd.org; Sat, 22 Dec 2007 13:43:00 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 22 Dec 2007 13:43:00 GMT
Message-Id: <200712221343.lBMDh0GR073419@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 131433 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: Sat, 22 Dec 2007 13:43:01 -0000

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

Change 131433 by hselasky@hselasky_laptop001 on 2007/12/22 13:42:50

	
	Prevent problems with regard to clearing USB endpoint stall.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ugen.c#34 edit

Differences ...

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

@@ -1862,6 +1862,20 @@
 			error = EINVAL;
 			break;
 		}
+		/*
+		 * Clearing the stall this way is not allowed, hence it does
+		 * not update the data toggle value in "struct usbd_pipe" !
+		 */
+		if (ur->ucr_request.bmRequestType == UT_WRITE_ENDPOINT) {
+			if (ur->ucr_request.wLength[0] ||
+			    ur->ucr_request.wLength[1]) {
+				error = EINVAL;
+			} else {
+				error = 0;
+				ur->ucr_actlen = 0;
+			}
+			break;
+		}
 		len = UGETW(ur->ucr_request.wLength);
 
 		if ((len < 0) || (len > 32767)) {