From owner-p4-projects@FreeBSD.ORG  Thu Jul 10 08:08:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75ED11065678; Thu, 10 Jul 2008 08:08:49 +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 397831065674
	for <perforce@FreeBSD.org>; Thu, 10 Jul 2008 08:08:49 +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 0A84A8FC1E
	for <perforce@FreeBSD.org>; Thu, 10 Jul 2008 08:08:49 +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 m6A88mlM064682
	for <perforce@FreeBSD.org>; Thu, 10 Jul 2008 08:08:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6A88m7x064680
	for perforce@freebsd.org; Thu, 10 Jul 2008 08:08:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 10 Jul 2008 08:08:48 GMT
Message-Id: <200807100808.m6A88m7x064680@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 144992 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: Thu, 10 Jul 2008 08:08:49 -0000

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

Change 144992 by hselasky@hselasky_laptop001 on 2008/07/10 08:08:19

	
	Fix another sleeping with mutex locked issue.

Affected files ...

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

Differences ...

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

@@ -704,9 +704,15 @@
 		return EBUSY;
 	}
 
+	/* destroy dev can sleep --hps */
+
+	snd_mtxunlock(m->lock);
+
 	pdev->si_drv1 = NULL;
 	destroy_dev(pdev);
 
+	snd_mtxlock(m->lock);
+
 	for (i = 0; i < SOUND_MIXER_NRDEVICES; i++)
 		mixer_set(m, i, 0);