From owner-p4-projects@FreeBSD.ORG  Tue Aug  3 15:45:41 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A788106568A; Tue,  3 Aug 2010 15:45:41 +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 B78AA1065673
	for <perforce@FreeBSD.org>; Tue,  3 Aug 2010 15:45:40 +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 A4A268FC15
	for <perforce@FreeBSD.org>; Tue,  3 Aug 2010 15:45:40 +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 o73Fje4H003153
	for <perforce@FreeBSD.org>; Tue, 3 Aug 2010 15:45:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o73FjeR5003151
	for perforce@freebsd.org; Tue, 3 Aug 2010 15:45:40 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 3 Aug 2010 15:45:40 GMT
Message-Id: <201008031545.o73FjeR5003151@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 181773 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: Tue, 03 Aug 2010 15:45:41 -0000

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

Change 181773 by hselasky@hselasky_laptop001 on 2010/08/03 15:45:30

	USB core:
		- allow the USB controller to select another USB
		address during the SET_ADDRESS request.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#37 edit

Differences ...

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

@@ -1776,8 +1776,12 @@
 		DPRINTFN(0, "addr=%d, set address failed! (%s, ignored)\n",
 		    old_addr, usbd_errstr(err));
 	}
-	/* restore device address */
-	udev->address = old_addr;
+	/*
+	 * Restore device address, if the controller driver did not
+	 * set a new one:
+	 */
+	if (udev->address == USB_START_ADDR)
+		udev->address = old_addr;
 
 	/* allow device time to set new address */
 	usb_pause_mtx(mtx, USB_MS_TO_TICKS(USB_SET_ADDRESS_SETTLE));
@@ -1809,7 +1813,8 @@
 		goto retry;
 	}
 	/* restore address */
-	udev->address = old_addr;
+	if (udev->address == USB_START_ADDR)
+		udev->address = old_addr;
 	return (err);
 }