Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't take sc_intr_lock in harmony_trigger_input it's already taken by 

our caller.

Found by /usr/tests/include/t_paths.
This commit is contained in:
skrll 2012-02-23 21:41:23 +00:00
parent b54a5f2dfe
commit 0aa6416b00
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/hp700/gsc/harmony.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: harmony.c,v 1.26 2012/02/02 19:42:59 tls Exp $ */
/* $NetBSD: harmony.c,v 1.27 2012/02/23 21:41:23 skrll Exp $ */
/* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */
@ -1259,12 +1259,12 @@ int
harmony_trigger_input(void *vsc, void *start, void *end, int blksize,
void (*intr)(void *), void *intrarg, const audio_params_t *param)
{
struct harmony_softc *sc;
struct harmony_channel *c;
struct harmony_softc *sc = vsc;
struct harmony_channel *c = &sc->sc_capture;
struct harmony_dma *d;
sc = vsc;
c = &sc->sc_capture;
KASSERT(mutex_owned(&sc->sc_intr_lock));
for (d = sc->sc_dmas; d->d_kva != start; d = d->d_next)
continue;
if (d == NULL) {
@ -1273,8 +1273,6 @@ harmony_trigger_input(void *vsc, void *start, void *end, int blksize,
return EINVAL;
}
mutex_spin_enter(&sc->sc_intr_lock);
c->c_intr = intr;
c->c_intrarg = intrarg;
c->c_blksz = blksize;
@ -1288,8 +1286,6 @@ harmony_trigger_input(void *vsc, void *start, void *end, int blksize,
harmony_start_cp(sc, 1);
harmony_intr_enable(sc);
mutex_spin_exit(&sc->sc_intr_lock);
return 0;
}