From owner-p4-projects@FreeBSD.ORG  Sat Dec 22 13:05:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D76116A41A; Sat, 22 Dec 2007 13:05:20 +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 782D716A418
	for <perforce@FreeBSD.org>; Sat, 22 Dec 2007 13:05:19 +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 7A3E313C458
	for <perforce@FreeBSD.org>; Sat, 22 Dec 2007 13:05:19 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBMD5JFf067202
	for <perforce@FreeBSD.org>; Sat, 22 Dec 2007 13:05:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBMD5J2U067199
	for perforce@freebsd.org; Sat, 22 Dec 2007 13:05:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 22 Dec 2007 13:05:19 GMT
Message-Id: <200712221305.lBMD5J2U067199@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>
Cc: 
Subject: PERFORCE change 131430 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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, 22 Dec 2007 13:05:20 -0000

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

Change 131430 by hselasky@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) {