Module Name: src
Committed By: jmcneill
Date: Sun Nov 20 18:25:46 UTC 2011
Modified Files:
src/sys/arch/sgimips/mace [jmcneill-audiomp3]: mavb.c
Log Message:
no need to enter intr_lock from trigger_output, it's already held
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.2 -r1.7.4.3 src/sys/arch/sgimips/mace/mavb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sgimips/mace/mavb.c
diff -u src/sys/arch/sgimips/mace/mavb.c:1.7.4.2 src/sys/arch/sgimips/mace/mavb.c:1.7.4.3
--- src/sys/arch/sgimips/mace/mavb.c:1.7.4.2 Sun Nov 20 16:07:27 2011
+++ src/sys/arch/sgimips/mace/mavb.c Sun Nov 20 18:25:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mavb.c,v 1.7.4.2 2011/11/20 16:07:27 jmcneill Exp $ */
+/* $NetBSD: mavb.c,v 1.7.4.3 2011/11/20 18:25:46 jmcneill Exp $ */
/* $OpenBSD: mavb.c,v 1.6 2005/04/15 13:05:14 mickey Exp $ */
/*
@@ -909,8 +909,6 @@ mavb_trigger_output(void *hdl, void *sta
sc->sc_count = 0;
- mutex_spin_enter(&sc->sc_intr_lock);
-
bus_space_write_8(sc->sc_st, sc->sc_sh, MAVB_CHANNEL2_CONTROL,
MAVB_CHANNEL_RESET);
delay(1000);
@@ -921,8 +919,6 @@ mavb_trigger_output(void *hdl, void *sta
bus_space_write_8(sc->sc_st, sc->sc_sh, MAVB_CHANNEL2_CONTROL,
MAVB_CHANNEL_DMA_ENABLE | MAVB_CHANNEL_INT_50);
- mutex_spin_exit(&sc->sc_intr_lock);
-
return 0;
}
