From owner-p4-projects@FreeBSD.ORG  Tue Sep 13 10:49:11 2005
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 76CD916A45C; Tue, 13 Sep 2005 10:49:10 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 109D616A445
	for <perforce@freebsd.org>; Tue, 13 Sep 2005 10:49:10 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B498443D8F
	for <perforce@freebsd.org>; Tue, 13 Sep 2005 10:48:54 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8DAmrLN039937
	for <perforce@freebsd.org>; Tue, 13 Sep 2005 10:48:53 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8DAmrcJ039934
	for perforce@freebsd.org; Tue, 13 Sep 2005 10:48:53 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Sep 2005 10:48:53 GMT
Message-Id: <200509131048.j8DAmrcJ039934@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 83536 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: Tue, 13 Sep 2005 10:49:11 -0000

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

Change 83536 by rwatson@rwatson_zoo on 2005/09/13 10:48:15

	Loop back fifofs fix.

Affected files ...

.. //depot/projects/netsmp/src/sys/dev/sound/pci/maestro3.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/fifofs/fifo_vnops.c#12 integrate

Differences ...

==== //depot/projects/netsmp/src/sys/dev/sound/pci/maestro3.c#2 (text+ko) ====

@@ -61,7 +61,7 @@
 #include <gnu/dev/sound/pci/maestro3_reg.h>
 #include <gnu/dev/sound/pci/maestro3_dsp.h>
 
-SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.28 2005/05/23 06:27:07 yongari Exp $");
+SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.29 2005/09/13 10:12:28 yongari Exp $");
 
 /* -------------------------------------------------------------------- */
 
@@ -1501,6 +1501,8 @@
 	int hint;
 
 	M3_LOCK_ASSERT(sc);
+
+	M3_UNLOCK(sc);
 	/*
 	 * The volume buttons can be wired up via two different sets of pins.
 	 * This presents a problem since we can't tell which way it's
@@ -1513,6 +1515,7 @@
 		hv_cfg = (hint > 0) ? HV_BUTTON_FROM_GD : 0;
 	else
 		hv_cfg = HV_BUTTON_FROM_GD;
+	M3_LOCK(sc);
 
 	data = pci_read_config(sc->dev, PCI_ALLEGRO_CONFIG, 4);
 	data &= ~HV_BUTTON_FROM_GD;

==== //depot/projects/netsmp/src/sys/fs/fifofs/fifo_vnops.c#12 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.122 2005/09/13 09:23:22 rwatson Exp $
+ * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.123 2005/09/13 10:39:24 rwatson Exp $
  */
 
 #include <sys/param.h>