[src/trunk]: src/sys/dev/bluetooth don't use mutex_spin*() on an IPL_NONE mut...

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

details:   https://anonhg.NetBSD.org/src/rev/50f840706d30
branches:  trunk
changeset: 778432:50f840706d30
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Mar 26 06:49:15 2012 +0000

description:
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 692f34672923 -r 50f840706d30 sys/dev/bluetooth/btsco.c
--- a/sys/dev/bluetooth/btsco.c Sun Mar 25 22:37:08 2012 +0000
+++ b/sys/dev/bluetooth/btsco.c Mon Mar 26 06:49:15 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: btsco.c,v 1.26 2011/12/10 16:16:11 jmcneill Exp $      */
+/*     $NetBSD: btsco.c,v 1.27 2012/03/26 06:49:15 mrg Exp $   */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.26 2011/12/10 16:16:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.27 2012/03/26 06:49:15 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/audioio.h>
@@ -458,7 +458,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);
@@ -467,7 +467,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:
@@ -501,13 +501,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
@@ -526,7 +526,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 {
@@ -552,7 +552,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);
 }