From owner-p4-projects@FreeBSD.ORG  Mon Jul 16 18:30:15 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 75F0216A408; Mon, 16 Jul 2007 18:30:15 +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 458AB16A406
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 18:30:15 +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 360B613C474
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 18:30:15 +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 l6GIUFoK031000
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 18:30:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6GIUEqW030997
	for perforce@freebsd.org; Mon, 16 Jul 2007 18:30:14 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 16 Jul 2007 18:30:14 GMT
Message-Id: <200707161830.l6GIUEqW030997@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 123607 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: Mon, 16 Jul 2007 18:30:15 -0000

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

Change 123607 by hselasky@hselasky_mini_itx on 2007/07/16 18:29:26

	Apply correct locking for USB audio mixer commands.

Affected files ...

.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio_pcm.c#6 edit

Differences ...

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

@@ -127,14 +127,22 @@
 static int
 ua_mixer_set(struct snd_mixer *m, unsigned type, unsigned left, unsigned right)
 {
+	struct mtx *mtx = mixer_get_lock(m);
+	snd_mtxlock(mtx); /* XXX */
 	uaudio_mixer_set(mix_getdevinfo(m), type, left, right);
+	snd_mtxunlock(mtx); /* XXX */
 	return (left | (right << 8));
 }
 
 static int
 ua_mixer_setrecsrc(struct snd_mixer *m, u_int32_t src)
 {
-	return uaudio_mixer_setrecsrc(mix_getdevinfo(m), src);
+	struct mtx *mtx = mixer_get_lock(m);
+	int retval;
+	snd_mtxlock(mtx); /* XXX */
+	retval = uaudio_mixer_setrecsrc(mix_getdevinfo(m), src);
+	snd_mtxunlock(mtx); /* XXX */
+	return retval;
 }
 
 static int