patch-1.3.78 linux/drivers/sound/gus_wave.c

• Lines: 18
• Date: Sun Mar 24 22:50:04 1996
• Orig file: v1.3.77/linux/drivers/sound/gus_wave.c
• Orig date: Fri Mar 15 16:03:17 1996

diff -u --recursive --new-file v1.3.77/linux/drivers/sound/gus_wave.c linux/drivers/sound/gus_wave.c
@@ -768,7 +768,7 @@
 
   irq_image = 0;
   tmp = gus_irq_map[gus_irq];
-  if (!tmp)
+  if (!gus_pnp_flag && !tmp)
     printk ("Warning! GUS IRQ not selected\n");
   irq_image |= tmp;
   irq_image |= 0x40;		/* Combine IRQ1 (GF1) and IRQ2 (Midi) */
@@ -1658,7 +1658,7 @@
 	  blk_sz = blk_end - target;
 	}
 
-      if (gus_no_dma)
+      if (gus_pnp_flag || gus_no_dma)
 	{
 	  /*
 	   * For some reason the DMA is not possible. We have to use PIO.