Module Name: src
Committed By: nat
Date: Tue May 23 04:58:49 UTC 2017
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
Revert locking changes back to rev 1.149. Dropping and reaquiring the
interrupt lock was not necessary for the proper operation of uaudio
devices.
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/dev/usb/uaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.151 src/sys/dev/usb/uaudio.c:1.152
--- src/sys/dev/usb/uaudio.c:1.151 Fri May 19 09:58:28 2017
+++ src/sys/dev/usb/uaudio.c Tue May 23 04:58:49 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.151 2017/05/19 09:58:28 nat Exp $ */
+/* $NetBSD: uaudio.c,v 1.152 2017/05/23 04:58:49 nat Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.151 2017/05/19 09:58:28 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.152 2017/05/23 04:58:49 nat Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2894,9 +2894,7 @@ uaudio_chan_pintr(struct usbd_xfer *xfer
while (ch->transferred >= ch->blksize) {
ch->transferred -= ch->blksize;
DPRINTFN(5, "call %p(%p)\n", ch->intr, ch->arg);
- mutex_exit(&ch->sc->sc_intr_lock);
ch->intr(ch->arg);
- mutex_enter(&ch->sc->sc_intr_lock);
}
mutex_exit(&ch->sc->sc_intr_lock);
@@ -2997,9 +2995,7 @@ uaudio_chan_rintr(struct usbd_xfer *xfer
while (ch->transferred >= ch->blksize) {
ch->transferred -= ch->blksize;
DPRINTFN(5, "call %p(%p)\n", ch->intr, ch->arg);
- mutex_exit(&ch->sc->sc_intr_lock);
ch->intr(ch->arg);
- mutex_enter(&ch->sc->sc_intr_lock);
}
mutex_exit(&ch->sc->sc_intr_lock);
