Module Name: src
Committed By: nonaka
Date: Sun Jan 15 10:59:51 UTC 2012
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_i2s.c
Log Message:
Don't lock sc->sc_intr_lock at halt_output(), halt_input().
sc->sc_intr_lock is already locked by audio_close().
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/pxa2x0_i2s.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/arm/xscale/pxa2x0_i2s.c
diff -u src/sys/arch/arm/xscale/pxa2x0_i2s.c:1.10 src/sys/arch/arm/xscale/pxa2x0_i2s.c:1.11
--- src/sys/arch/arm/xscale/pxa2x0_i2s.c:1.10 Wed Nov 23 23:07:29 2011
+++ src/sys/arch/arm/xscale/pxa2x0_i2s.c Sun Jan 15 10:59:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_i2s.c,v 1.10 2011/11/23 23:07:29 jmcneill Exp $ */
+/* $NetBSD: pxa2x0_i2s.c,v 1.11 2012/01/15 10:59:50 nonaka Exp $ */
/* $OpenBSD: pxa2x0_i2s.c,v 1.7 2006/04/04 11:45:40 pascoe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2s.c,v 1.10 2011/11/23 23:07:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2s.c,v 1.11 2012/01/15 10:59:50 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -322,12 +322,10 @@ pxa2x0_i2s_halt_output(void *hdl)
{
struct pxa2x0_i2s_softc *sc = hdl;
- mutex_spin_enter(sc->sc_intr_lock);
if (sc->sc_txdma) {
pxa2x0_dmac_abort_xfer(sc->sc_txdma->dx);
sc->sc_txdma = NULL;
}
- mutex_spin_exit(sc->sc_intr_lock);
return 0;
}
@@ -337,12 +335,10 @@ pxa2x0_i2s_halt_input(void *hdl)
{
struct pxa2x0_i2s_softc *sc = hdl;
- mutex_spin_enter(sc->sc_intr_lock);
if (sc->sc_rxdma) {
pxa2x0_dmac_abort_xfer(sc->sc_rxdma->dx);
sc->sc_rxdma = NULL;
}
- mutex_spin_exit(sc->sc_intr_lock);
return 0;
}
@@ -368,7 +364,7 @@ pxa2x0_i2s_start_output(void *hdl, void
}
if (p == NULL) {
aprint_error("pxa2x0_i2s_start_output: "
- "request with bad start address: %p, size: %d)\n",
+ "request with bad start address: %p, size: %d\n",
block, bsize);
return ENXIO;
}
@@ -418,7 +414,7 @@ pxa2x0_i2s_start_input(void *hdl, void *
}
if (p == NULL) {
aprint_error("pxa2x0_i2s_start_input: "
- "request with bad start address: %p, size: %d)\n",
+ "request with bad start address: %p, size: %d\n",
block, bsize);
return ENXIO;
}