From owner-p4-projects@FreeBSD.ORG  Sat May 19 21:40:55 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9719F16A485; Sat, 19 May 2007 21:40:55 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4B02116A46B
	for <perforce@FreeBSD.org>; Sat, 19 May 2007 21:40:55 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 39E0413C457
	for <perforce@FreeBSD.org>; Sat, 19 May 2007 21:40:55 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JLetGC022165
	for <perforce@FreeBSD.org>; Sat, 19 May 2007 21:40:55 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JLesM2022155
	for perforce@freebsd.org; Sat, 19 May 2007 21:40:54 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 19 May 2007 21:40:54 GMT
Message-Id: <200705192140.l4JLesM2022155@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 120084 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, 19 May 2007 21:40:56 -0000

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

Change 120084 by hselasky@hselasky_mini_itx on 2007/05/19 21:40:06

	Fix some problem related to sync/adaptive endpoints.

Affected files ...

.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#11 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#11 (text+ko) ====

@@ -1042,11 +1042,12 @@
 		    ep_sync = 1;
 		}
 
+		/* Ignore sync endpoint information until further. */
+#if 0
 		if (ep_sync && (!ed2)) {
 		    continue;
 		}
 
-#if 1
 		/* we can't handle endpoints that need a sync pipe yet */
 
 		if (ep_sync) {
@@ -1425,8 +1426,8 @@
 	 */
 	if (ch->p_asf1d->bSamFreqType != 1) {
 	    if (uaudio_set_speed(sc->sc_udev, endpoint, ch->sample_rate)) {
-	        DPRINTF(0, "setting of sample rate failed!\n");
-		goto error;
+		/* If the endpoint is adaptive setting the speed may fail. */
+		DPRINTF(0, "setting of sample rate failed! (continuing anyway)\n");
 	    }
 	}