 @@ -1,14 +1,14 @@
-/*	$NetBSD: btsco.c,v 1.25 2011/11/23 23:07:31 jmcneill Exp $	*/
+/*	$NetBSD: btsco.c,v 1.26 2011/12/10 16:16:11 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Written by Iain Hibbert for Itronix Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,27 +22,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ITRONIX INC. BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.25 2011/11/23 23:07:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.26 2011/12/10 16:16:11 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/audioio.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/queue.h>
 #include <sys/kmem.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/systm.h>
 @@ -566,27 +566,27 @@ static int
 btsco_open(void *hdl, int flags)
+{
 	struct sockaddr_bt sa;
 	struct btsco_softc *sc = hdl;
 	struct sockopt sopt;
 	int err, timo;
 	DPRINTF("%s flags 0x%x\n", sc->sc_name, flags);
 	/* flags FREAD & FWRITE? */
 	if (sc->sc_sco != NULL || sc->sc_sco_l != NULL)
 		return EIO;
-	mutex_enter(bt_lock);
+	KASSERT(mutex_owned(bt_lock));
 	memset(&sa, 0, sizeof(sa));
 	sa.bt_len = sizeof(sa);
 	sa.bt_family = AF_BLUETOOTH;
 	bdaddr_copy(&sa.bt_bdaddr, &sc->sc_laddr);
 	if (sc->sc_flags & BTSCO_LISTEN) {
 		err = sco_attach(&sc->sc_sco_l, &btsco_sco_proto, sc);
 		if (err)
 			goto done;
 		err = sco_bind(sc->sc_sco_l, &sa);
 		if (err) {
 @@ -643,50 +643,48 @@ btsco_open(void *hdl, int flags)
 	case BTSCO_OPEN:		/* hurrah */
 		sockopt_init(&sopt, BTPROTO_SCO, SO_SCO_MTU, 0);
 		(void)sco_getopt(sc->sc_sco, &sopt);
 		(void)sockopt_get(&sopt, &sc->sc_mtu, sizeof(sc->sc_mtu));
 		sockopt_destroy(&sopt);
 		break;
 	default:
 		UNKNOWN(sc->sc_state);
 		break;
+	}
 done:
 	mutex_exit(bt_lock);
 	DPRINTF("done err=%d, sc_state=%d, sc_mtu=%d\n",
 			err, sc->sc_state, sc->sc_mtu);
 	return err;
+}
 static void
 btsco_close(void *hdl)
+{
 	struct btsco_softc *sc = hdl;
 	DPRINTF("%s\n", sc->sc_name);
-	mutex_enter(bt_lock);
+	KASSERT(mutex_owned(bt_lock));
 	if (sc->sc_sco != NULL) {
 		sco_disconnect(sc->sc_sco, 0);
 		sco_detach(&sc->sc_sco);
+	}
 	if (sc->sc_sco_l != NULL) {
 		sco_detach(&sc->sc_sco_l);
+	}
 	mutex_exit(bt_lock);
 	if (sc->sc_rx_mbuf != NULL) {
 		m_freem(sc->sc_rx_mbuf);
 		sc->sc_rx_mbuf = NULL;
+	}
 	sc->sc_rx_want = 0;
 	sc->sc_rx_block = NULL;
 	sc->sc_rx_intr = NULL;
 	sc->sc_rx_intrarg = NULL;
 	sc->sc_tx_size = 0;
 	sc->sc_tx_block = NULL;