[src/netbsd-6]: src/sys/dev/bluetooth Pull up following revision(s) (requeste...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f47ba80ae31c
branches:  netbsd-6
changeset: 773989:f47ba80ae31c
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 09 17:51:44 2012 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #165):
        sys/dev/bluetooth/btsco.c: revision 1.27
don't use mutex_spin*() on an IPL_NONE mutex.  fixes PR#46120.

diffstat:

 sys/dev/bluetooth/btsco.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r b0e72c4cea6a -r f47ba80ae31c sys/dev/bluetooth/btsco.c
--- a/sys/dev/bluetooth/btsco.c Mon Apr 09 17:46:58 2012 +0000
+++ b/sys/dev/bluetooth/btsco.c Mon Apr 09 17:51:44 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: btsco.c,v 1.26.2.1 2012/04/03 17:31:19 riz Exp $       */
+/*     $NetBSD: btsco.c,v 1.26.2.2 2012/04/09 17:51:44 riz Exp $       */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.26.2.1 2012/04/03 17:31:19 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.26.2.2 2012/04/09 17:51:44 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/audioio.h>
@@ -462,7 +462,7 @@
                 * has completed so that when it tries to send more, we
                 * can indicate an error.
                 */
-               mutex_spin_enter(&sc->sc_intr_lock);
+               mutex_enter(&sc->sc_intr_lock);
                if (sc->sc_tx_pending > 0) {
                        sc->sc_tx_pending = 0;
                        (*sc->sc_tx_intr)(sc->sc_tx_intrarg);
@@ -471,7 +471,7 @@
                        sc->sc_rx_want = 0;
                        (*sc->sc_rx_intr)(sc->sc_rx_intrarg);
                }
-               mutex_spin_exit(&sc->sc_intr_lock);
+               mutex_exit(&sc->sc_intr_lock);
                break;
 
        default:
@@ -505,13 +505,13 @@
 
        DPRINTFN(10, "%s count %d\n", sc->sc_name, count);
 
-       mutex_spin_enter(&sc->sc_intr_lock);
+       mutex_enter(&sc->sc_intr_lock);
        if (sc->sc_tx_pending > 0) {
                sc->sc_tx_pending -= count;
                if (sc->sc_tx_pending == 0)
                        (*sc->sc_tx_intr)(sc->sc_tx_intrarg);
        }
-       mutex_spin_exit(&sc->sc_intr_lock);
+       mutex_exit(&sc->sc_intr_lock);
 }
 
 static void
@@ -530,7 +530,7 @@
 
        DPRINTFN(10, "%s len=%d\n", sc->sc_name, m->m_pkthdr.len);
 
-       mutex_spin_enter(&sc->sc_intr_lock);
+       mutex_enter(&sc->sc_intr_lock);
        if (sc->sc_rx_want == 0) {
                m_freem(m);
        } else {
@@ -556,7 +556,7 @@
                if (sc->sc_rx_want == 0)
                        (*sc->sc_rx_intr)(sc->sc_rx_intrarg);
        }
-       mutex_spin_exit(&sc->sc_intr_lock);
+       mutex_exit(&sc->sc_intr_lock);
 }