From owner-p4-projects@FreeBSD.ORG  Sat Aug  7 15:23:11 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ABFA61065676; Sat,  7 Aug 2010 15:23:11 +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 708CB1065674
	for <perforce@FreeBSD.org>; Sat,  7 Aug 2010 15:23:11 +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 5DBDC8FC08
	for <perforce@FreeBSD.org>; Sat,  7 Aug 2010 15:23:11 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o77FNBVn007290
	for <perforce@FreeBSD.org>; Sat, 7 Aug 2010 15:23:11 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o77FNBKk007288
	for perforce@freebsd.org; Sat, 7 Aug 2010 15:23:11 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 7 Aug 2010 15:23:11 GMT
Message-Id: <201008071523.o77FNBKk007288@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 182031 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: Sat, 07 Aug 2010 15:23:11 -0000

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

Change 182031 by hselasky@hselasky_laptop001 on 2010/08/07 15:23:08

	USB core:
		- The XHCI will select the address and not the
		USB software stack. Give room for that.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#75 edit

Differences ...

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

@@ -1642,9 +1642,12 @@
 
 		err = usbd_req_set_address(udev, NULL, device_index);
 
-		/* This is the new USB device address from now on */
-
-		udev->address = device_index;
+		/*
+		 * This is the new USB device address from now on, if
+		 * the set address request didn't set it already.
+		 */
+		if (udev->address == USB_START_ADDR)
+			udev->address = device_index;
 
 		/*
 		 * We ignore any set-address errors, hence there are