PERFORCE change 182031 for review

[Hans Petter Selasky]

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

Change 182031 by hselasky at 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