 @@ -1,14 +1,14 @@
-/* $NetBSD: pad.c,v 1.26 2016/10/15 07:08:06 nat Exp $ */
+/* $NetBSD: pad.c,v 1.27 2017/01/26 04:10:27 nat Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND 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 THE FOUNDATION OR CONTRIBUTORS
  * 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: pad.c,v 1.26 2016/10/15 07:08:06 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.27 2017/01/26 04:10:27 nat Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/condvar.h>
 #include <sys/select.h>
 #include <sys/audioio.h>
 #include <sys/vnode.h>
 @@ -352,31 +352,31 @@ pad_read(dev_t dev, struct uio *uio, int
 	uint64_t nowusec, lastusec;
 	pad_softc_t *sc;
 	pad_block_t pb;
 	void (*intr)(void *);
 	void *intrarg;
 	int err, wait_ticks;
 	sc = device_lookup_private(&pad_cd, PADUNIT(dev));
 	if (sc == NULL)
 		return ENXIO;
 	err = 0;
 	mutex_enter(&sc->sc_lock);
 	intr = sc->sc_intr;
 	intrarg = sc->sc_intrarg;
 	while (uio->uio_resid > 0 && !err) {
 		mutex_enter(&sc->sc_lock);
 		intr = sc->sc_intr;
 		intrarg = sc->sc_intrarg;
 		getmicrotime(&now);
 		nowusec = (now.tv_sec * 1000000) + now.tv_usec;
 		lastusec = (sc->sc_last.tv_sec * 1000000) +
 		     sc->sc_last.tv_usec;
 		if (lastusec + TIMENEXTREAD > nowusec &&
 		     sc->sc_bytes_count >= BYTESTOSLEEP) {
 			wait_ticks = (hz * ((lastusec + TIMENEXTREAD) -
 			     nowusec)) / 1000000;
 			if (wait_ticks > 0) {
 				kpause("padwait", TRUE, wait_ticks,
 				     &sc->sc_lock);
+			}
 @@ -384,49 +384,49 @@ pad_read(dev_t dev, struct uio *uio, int
 			getmicrotime(&sc->sc_last);
 		} else if (sc->sc_bytes_count >= BYTESTOSLEEP) {
 			sc->sc_bytes_count -= BYTESTOSLEEP;
 			getmicrotime(&sc->sc_last);
 		} else if (lastusec + TIMENEXTREAD <= nowusec)
 			getmicrotime(&sc->sc_last);
 		err = pad_get_block(sc, &pb, min(uio->uio_resid, PAD_BLKSIZE));
 		if (!err) {
 			sc->sc_bytes_count += pb.pb_len;
 			mutex_exit(&sc->sc_lock);
 			err = uiomove(pb.pb_ptr, pb.pb_len, uio);
 			mutex_enter(&sc->sc_lock);
 			continue;
+		}
 		if (intr) {
 			mutex_enter(&sc->sc_intr_lock);
 			kpreempt_disable();
 			(*intr)(intrarg);
 			kpreempt_enable();
 			mutex_exit(&sc->sc_intr_lock);
 			intr = sc->sc_intr;
 			intrarg = sc->sc_intrarg;
 			err = 0;
 			mutex_exit(&sc->sc_lock);
 			continue;
+		}
 		err = cv_wait_sig(&sc->sc_condvar, &sc->sc_lock);
-		if (err != 0)
+		if (err != 0) {
 			mutex_exit(&sc->sc_lock);
 			break;
+		}
-		intr = sc->sc_intr;
+		mutex_exit(&sc->sc_lock);
 		intrarg = sc->sc_intrarg;
+	}
 	mutex_exit(&sc->sc_lock);
 	return err;
+}
 static int
 pad_audio_open(void *opaque, int flags)
+{
 	pad_softc_t *sc;
 	sc = opaque;
 	if (sc->sc_open == 0)
 		return EIO;