From owner-p4-projects@FreeBSD.ORG  Mon Oct 19 19:59: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 081F01065676; Mon, 19 Oct 2009 19:59:39 +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 C0B621065670
	for <perforce@FreeBSD.org>; Mon, 19 Oct 2009 19:59: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 AF5268FC1D
	for <perforce@FreeBSD.org>; Mon, 19 Oct 2009 19:59: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 n9JJxcnD006664
	for <perforce@FreeBSD.org>; Mon, 19 Oct 2009 19:59:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9JJxc9i006662
	for perforce@freebsd.org; Mon, 19 Oct 2009 19:59:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 19 Oct 2009 19:59:38 GMT
Message-Id: <200910191959.n9JJxc9i006662@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 169605 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 19 Oct 2009 19:59:39 -0000

http://p4web.freebsd.org/chv.cgi?CH=169605

Change 169605 by hselasky@hselasky_laptop001 on 2009/10/19 19:59:35

	
	LibUSB:
		- clamp timeout variable in user-space aswell as in kernel-space,
		so that large timeouts get the maximum timeout.

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#8 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#8 (text+ko) ====

@@ -800,7 +800,11 @@
 	if (xfer->flags & LIBUSB20_TRANSFER_DO_CLEAR_STALL) {
 		fsep->flags |= USB_FS_FLAG_CLEAR_STALL;
 	}
-	fsep->timeout = xfer->timeout;
+	/* NOTE: The "fsep->timeout" variable is 16-bit. */
+	if (xfer->timeout > 65535)
+		fsep->timeout = 65535;
+	else
+		fsep->timeout = xfer->timeout;
 
 	temp.ep_index = xfer->trIndex;