From owner-svn-src-all@FreeBSD.ORG  Thu Oct 30 08:32:18 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D53F41065676;
	Thu, 30 Oct 2008 08:32:18 +0000 (UTC)
	(envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C42E68FC17;
	Thu, 30 Oct 2008 08:32:18 +0000 (UTC)
	(envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9U8WI9o045753;
	Thu, 30 Oct 2008 08:32:18 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9U8WInO045752;
	Thu, 30 Oct 2008 08:32:18 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <200810300832.m9U8WInO045752@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 30 Oct 2008 08:32:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184466 - head/sys/dev/usb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Oct 2008 08:32:19 -0000

Author: n_hibma
Date: Thu Oct 30 08:32:18 2008
New Revision: 184466
URL: http://svn.freebsd.org/changeset/base/184466

Log:
  We need to print out the device info ourselves on FBSD 6.
  
  Submitted by:	Thomas Nystrom

Modified:
  head/sys/dev/usb/u3g.c

Modified: head/sys/dev/usb/u3g.c
==============================================================================
--- head/sys/dev/usb/u3g.c	Thu Oct 30 08:17:27 2008	(r184465)
+++ head/sys/dev/usb/u3g.c	Thu Oct 30 08:32:18 2008	(r184466)
@@ -227,6 +227,13 @@ u3g_attach(device_t self)
 	usb_config_descriptor_t *cd;
 	char devnamefmt[32];
 
+#if __FreeBSD_version < 700000
+	char *devinfo = malloc(1024, M_USBDEV, M_WAITOK);
+	usbd_devinfo(dev, 0, devinfo);
+	device_printf(self, "%s\n", devinfo);
+	free(devinfo, M_USBDEV);
+#endif
+
 	/* get the config descriptor */
 	cd = usbd_get_config_descriptor(dev);
 	if (cd == NULL) {