PERFORCE change 131430 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=131430

Change 131430 by hselasky at hselasky_laptop001 on 2007/12/22 13:05:07

	
	Patch to make "libusb" work.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#76 edit

Differences ...

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

@@ -1040,6 +1040,14 @@
 	di->udi_power = udev->flags.self_powered ? 0 : udev->power;
 	di->udi_speed = udev->speed;
 
+	if (udev->probed == USBD_PROBED_SPECIFIC_AND_FOUND) {
+		if (udev->global_dev &&
+		    device_is_attached(udev->global_dev)) {
+			strlcpy(di->udi_devnames[0],
+			    device_get_nameunit(udev->global_dev),
+			    USB_MAX_DEVNAMELEN);
+		}
+	} else if (udev->probed == USBD_PROBED_IFACE_AND_FOUND) {
 	for (i = 0; i != MIN(USB_MAX_DEVNAMES, USB_MAX_INTERFACES); i++) {
 		iface = usbd_get_iface(udev, i);
 		if (iface && iface->subdev &&
@@ -1049,6 +1057,7 @@
 			    USB_MAX_DEVNAMELEN);
 		}
 	}
+	}
 
 	if (udev->hub) {