From owner-p4-projects@FreeBSD.ORG  Wed Aug 25 07:22:00 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D7BC310656AD; Wed, 25 Aug 2010 07:21:59 +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 9A8C310656AA
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 07:21:59 +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 87F9E8FC0C
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 07:21:59 +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 o7P7LxVL041095
	for <perforce@FreeBSD.org>; Wed, 25 Aug 2010 07:21:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7P7LxA9041092
	for perforce@freebsd.org; Wed, 25 Aug 2010 07:21:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 25 Aug 2010 07:21:59 GMT
Message-Id: <201008250721.o7P7LxA9041092@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 182874 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:22:00 -0000

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

Change 182874 by hselasky@hselasky_laptop001 on 2010/08/25 07:21:44

	USB controller (EHCI):
		- use same check like in XHCI driver for
		setting the CERR field.
		- we should not use this feature during
		normal data transactions, but rather let
		the data transfers fail if there is bad
		signal conditions so.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#59 edit

Differences ...

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

@@ -1866,7 +1866,8 @@
 		temp.auto_data_toggle = 1;
 	}
 
-	if (usbd_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) {
+	if ((xfer->xroot->udev->parent_hs_hub != NULL) ||
+	    (xfer->xroot->udev->address != 0)) {
 		/* max 3 retries */
 		temp.qtd_status |=
 		    htohc32(temp.sc, EHCI_QTD_SET_CERR(3));