patch-2.1.13 linux/drivers/sound/gus_midi.c

Next file: linux/drivers/sound/gus_wave.c
Previous file: linux/drivers/sound/dmabuf.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.12/linux/drivers/sound/gus_midi.c linux/drivers/sound/gus_midi.c
@@ -27,6 +27,7 @@
 static void     (*midi_input_intr) (int dev, unsigned char data);
 
 static unsigned char tmp_queue[256];
+extern int      gus_pnp_flag;
 static volatile int qlen;
 static volatile unsigned char qhead, qtail;
 extern int      gus_base, gus_irq, gus_dma;
@@ -58,10 +59,11 @@
   input_opened = 0;
 
   if (mode == OPEN_READ || mode == OPEN_READWRITE)
-    {
-      gus_midi_control |= MIDI_ENABLE_RCV;
-      input_opened = 1;
-    }
+    if (!gus_pnp_flag)
+      {
+	gus_midi_control |= MIDI_ENABLE_RCV;
+	input_opened = 1;
+      }
 
 
   outb ((gus_midi_control), u_MidiControl);	/* Enable */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov