From owner-p4-projects@FreeBSD.ORG  Fri Feb  6 11:00:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E64691065677; Fri,  6 Feb 2009 11:00:12 +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 A62AB106566C
	for <perforce@FreeBSD.org>; Fri,  6 Feb 2009 11:00:12 +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 810F18FC16
	for <perforce@FreeBSD.org>; Fri,  6 Feb 2009 11:00:12 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n16B0C2r032267
	for <perforce@FreeBSD.org>; Fri, 6 Feb 2009 11:00:12 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n16B0Ctl032265
	for perforce@freebsd.org; Fri, 6 Feb 2009 11:00:12 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 6 Feb 2009 11:00:12 GMT
Message-Id: <200902061100.n16B0Ctl032265@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 157255 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: Fri, 06 Feb 2009 11:00:13 -0000

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

Change 157255 by hselasky@hselasky_laptop001 on 2009/02/06 11:00:00

	
	USB Audio: Make sure that attach waits for the generic
	probe to leave room for firware loader drivers and device
	specific USB Audio drivers like USB phone adapters.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#28 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#28 (text+ko) ====

@@ -539,9 +539,12 @@
 {
 	struct usb2_attach_arg *uaa = device_get_ivars(dev);
 
-	if (uaa->usb2_mode != USB_MODE_HOST) {
+	if (uaa->usb2_mode != USB_MODE_HOST)
+		return (ENXIO);
+
+	if (uaa->use_generic == 0)
 		return (ENXIO);
-	}
+
 	/* trigger on the control interface */
 
 	if ((uaa->info.bInterfaceClass == UICLASS_AUDIO) &&