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

• Lines: 47
• Date: Sat Jun 13 10:23:52 1998
• Orig file: v2.1.105/linux/drivers/sound/gus_wave.c
• Orig date: Sun Jun 7 11:16:35 1998

diff -u --recursive --new-file v2.1.105/linux/drivers/sound/gus_wave.c linux/drivers/sound/gus_wave.c
@@ -3128,30 +3128,24 @@
 	
 	if ((gus_mem_size > 0) & !gus_no_wave_dma)
 	{
-		if ((dev = sound_alloc_audiodev()) != -1)
+		hw_config->slots[4] = -1;
+		if ((gus_devnum = sound_install_audiodrv(AUDIO_DRIVER_VERSION,
+					"Ultrasound",
+					&gus_audio_driver,
+					sizeof(struct audio_driver),
+					NEEDS_RESTART |
+		                   	((!iw_mode && dma2 != dma && dma2 != -1) ?
+						DMA_DUPLEX : 0),
+					AFMT_U8 | AFMT_S16_LE,
+					NULL, dma, dma2)) < 0)
 		{
-			hw_config->slots[4] = dev;
-			if ((gus_devnum = sound_install_audiodrv(AUDIO_DRIVER_VERSION,
-							    "Ultrasound",
-						       &gus_audio_driver,
-					     sizeof(struct audio_driver),
-							  NEEDS_RESTART |
-								                   ((!iw_mode && dma2 != dma && dma2 != -1) ?
-							 DMA_DUPLEX : 0),
-						   AFMT_U8 | AFMT_S16_LE,
-								   NULL,
-								   dma,
-							      dma2)) < 0)
-			{
-				return;
-			}
+			return;
+		}
 
-			audio_devs[gus_devnum]->min_fragment = 9;	/* 512k */
-			audio_devs[gus_devnum]->max_fragment = 11;	/* 8k (must match size of bounce_buf */
-			audio_devs[gus_devnum]->mixer_dev = -1;	/* Next mixer# */
-			audio_devs[gus_devnum]->flags |= DMA_HARDSTOP;
-		} else
-			printk(KERN_WARNING "GUS: Too many audio devices available\n");
+		audio_devs[gus_devnum]->min_fragment = 9;	/* 512k */
+		audio_devs[gus_devnum]->max_fragment = 11;	/* 8k (must match size of bounce_buf */
+		audio_devs[gus_devnum]->mixer_dev = -1;	/* Next mixer# */
+		audio_devs[gus_devnum]->flags |= DMA_HARDSTOP;
 	}
 	
 	/*