From owner-p4-projects@FreeBSD.ORG  Wed Aug 25 07:19:50 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5FBFB10656AA; Wed, 25 Aug 2010 07:19:50 +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 D672910656A4
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 07:19:49 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C449B8FC18
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 07:19:49 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7P7JnAA039231
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 07:19:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7P7JnKu039228
	for perforce@freebsd.org; Wed, 25 Aug 2010 07:19:49 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 25 Aug 2010 07:19:49 GMT
Message-Id: <201008250719.o7P7JnKu039228@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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 182873 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: Wed, 25 Aug 2010 07:19:50 -0000

http://p4web.freebsd.org/@@182873?ac=10

Change 182873 by hselasky@hselasky_laptop001 on 2010/08/25 07:19:48

	
	USB controller (XHCI):
		- correct average TRB length computation

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#29 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#29 (text+ko) ====

@@ -2091,7 +2091,7 @@
 	case UE_INTERRUPT:
 	case UE_ISOCHRONOUS:
 		temp = XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size) |
-		    XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_PAGE_SIZE);
+		    XHCI_EPCTX_4_AVG_TRB_LEN_SET(MIN(XHCI_PAGE_SIZE, max_frame_size));
 		break;
 	case UE_CONTROL:
 		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(8);