PERFORCE change 83536 for review

[Robert Watson]

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

Change 83536 by rwatson at 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>