- Do not touch the Giant.

Requested by:	jhb

- Initialize a mutex prior to locking it.

Spotted by:	dcs

3 files changed, 0 insertions, 12 deletions

diff --git a/sys/dev/sound/isa/gusmidi.c b/sys/dev/sound/isa/gusmidi.c
index e40e8c1..a9b2150 100644
--- a/sys/dev/sound/isa/gusmidi.c
+++ b/sys/dev/sound/isa/gusmidi.c
@@ -294,8 +294,6 @@ gusmidi_intr(void *arg)
 	scp = (sc_p)arg;
 	devinfo = scp->devinfo;
 
-	MIDI_DROP_GIANT_NOSWITCH();
-
 	/* XXX No framing/overrun checks...  */
 	mtx_lock(&devinfo->flagqueue_mtx);
 	mtx_lock(&scp->mtx);
@@ -341,8 +339,6 @@ gusmidi_intr(void *arg)
 
 	/* Invoke the upper layer. */
 	midi_intr(devinfo);
-
-	MIDI_PICKUP_GIANT();
 }
 
 static int
diff --git a/sys/dev/sound/isa/mpu.c b/sys/dev/sound/isa/mpu.c
index 2ccd0a2..7653010 100644
--- a/sys/dev/sound/isa/mpu.c
+++ b/sys/dev/sound/isa/mpu.c
@@ -457,8 +457,6 @@ mpu_intr(void *arg)
 	scp = (sc_p)arg;
 	devinfo = scp->devinfo;
 
-	MIDI_DROP_GIANT_NOSWITCH();
-
 	mtx_lock(&devinfo->flagqueue_mtx);
 	mtx_lock(&scp->mtx);
 
@@ -483,8 +481,6 @@ mpu_intr(void *arg)
 
 	/* Invoke the upper layer. */
 	midi_intr(devinfo);
-
-	MIDI_PICKUP_GIANT();
 }
 
 static int
diff --git a/sys/dev/sound/isa/uartsio.c b/sys/dev/sound/isa/uartsio.c
index b98e0f3..3f514a8 100644
--- a/sys/dev/sound/isa/uartsio.c
+++ b/sys/dev/sound/isa/uartsio.c
@@ -311,16 +311,12 @@ uartsio_intr(void *arg)
 	scp = (sc_p)arg;
 	devinfo = scp->devinfo;
 
-	MIDI_DROP_GIANT_NOSWITCH();
-
 	mtx_lock(&devinfo->flagqueue_mtx);
 	uartsio_xmit(scp);
 	mtx_unlock(&devinfo->flagqueue_mtx);
 
 	/* Invoke the upper layer. */
 	midi_intr(devinfo);
-
-	MIDI_PICKUP_GIANT();
 }
 
 static int