summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorAlexandre Ratchov <ratchov@cvs.openbsd.org>2014-08-20 07:19:43 +0000
committerAlexandre Ratchov <ratchov@cvs.openbsd.org>2014-08-20 07:19:43 +0000
commit851ff7c25ee5fbc478db9b4ba6912ebef53b4282 (patch)
treebc34d6a1d2e995ebe6ae8a6d0c8c48d0c3c81356 /sys/dev
parentae6946bc3a2ab5a6f7912796e335955fd968e67b (diff)
Call audio_{pint,rint}() call-backs with the mutex held. Found by
Izumi Tsutsui, thanks! ok miod@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/arcofi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ic/arcofi.c b/sys/dev/ic/arcofi.c
index 5c1b2324a35..88ef3b920d8 100644
--- a/sys/dev/ic/arcofi.c
+++ b/sys/dev/ic/arcofi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arcofi.c,v 1.9 2014/08/19 18:02:48 miod Exp $ */
+/* $OpenBSD: arcofi.c,v 1.10 2014/08/20 07:19:42 ratchov Exp $ */
/*
* Copyright (c) 2011 Miodrag Vallat.
@@ -1150,7 +1150,6 @@ arcofi_swintr(void *v)
action |= AUMODE_RECORD;
if (sc->sc_xmit.buf != NULL && sc->sc_xmit.buf == sc->sc_xmit.past)
action |= AUMODE_PLAY;
- mtx_leave(&audio_lock);
if (action & AUMODE_RECORD) {
if (sc->sc_recv.cb)
@@ -1160,6 +1159,7 @@ arcofi_swintr(void *v)
if (sc->sc_xmit.cb)
sc->sc_xmit.cb(sc->sc_xmit.cbarg);
}
+ mtx_leave(&audio_lock);
}
int