[src/trunk]: src/sys/dev/usb Revert locking changes back to rev 1.149. Dropp...

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

details:   https://anonhg.NetBSD.org/src/rev/597bb5d94289
branches:  trunk
changeset: 824093:597bb5d94289
user:      nat <nat%NetBSD.org@localhost>
date:      Tue May 23 04:58:49 2017 +0000

description:
Revert locking changes back to rev 1.149.  Dropping and reaquiring the
interrupt lock was not necessary for the proper operation of uaudio
devices.

diffstat:

 sys/dev/usb/uaudio.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r f12f549edd93 -r 597bb5d94289 sys/dev/usb/uaudio.c
--- a/sys/dev/usb/uaudio.c      Tue May 23 04:51:31 2017 +0000
+++ b/sys/dev/usb/uaudio.c      Tue May 23 04:58:49 2017 +0000
@@ -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 @@
        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 @@
        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);