From owner-svn-src-all@FreeBSD.ORG  Mon Feb  9 22:11:02 2009
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 E9C791065670;
	Mon,  9 Feb 2009 22:11:02 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D6FFD8FC19;
	Mon,  9 Feb 2009 22:11:02 +0000 (UTC)
	(envelope-from thompsa@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 n19MB2Vs072847;
	Mon, 9 Feb 2009 22:11:02 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n19MB2hV072846;
	Mon, 9 Feb 2009 22:11:02 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200902092211.n19MB2hV072846@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Mon, 9 Feb 2009 22:11:02 +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: r188416 - head/sys/dev/usb2/sound
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: Mon, 09 Feb 2009 22:11:04 -0000

Author: thompsa
Date: Mon Feb  9 22:11:02 2009
New Revision: 188416
URL: http://svn.freebsd.org/changeset/base/188416

Log:
  MFp4 //depot/projects/usb; 157069, 157255
  
   - Change "usb2_pause_mtx" so that it takes the timeout value in ticks
   - 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
  
  Submitted by:	Hans Petter Selasky

Modified:
  head/sys/dev/usb2/sound/uaudio2.c

Modified: head/sys/dev/usb2/sound/uaudio2.c
==============================================================================
--- head/sys/dev/usb2/sound/uaudio2.c	Mon Feb  9 22:09:21 2009	(r188415)
+++ head/sys/dev/usb2/sound/uaudio2.c	Mon Feb  9 22:11:02 2009	(r188416)
@@ -539,9 +539,12 @@ uaudio_probe(device_t dev)
 {
 	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) &&
@@ -725,9 +728,7 @@ repeat:
 
 	if (error) {
 		device_printf(dev, "Waiting for sound application to exit!\n");
-		mtx_lock(&Giant);
-		usb2_pause_mtx(&Giant, 2000);
-		mtx_unlock(&Giant);
+		usb2_pause_mtx(NULL, 2 * hz);
 		goto repeat;		/* try again */
 	}
 	return (0);			/* success */