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

Next file: linux/drivers/sound/sb_card.c
Previous file: linux/arch/alpha/lib/semaphore.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0/linux/drivers/sound/gus_wave.c linux/drivers/sound/gus_wave.c
@@ -144,7 +144,6 @@
 
 static int      freq_div_table[] =
 {
-	44100,
 	44100,			/* 14 */
 	41160,			/* 15 */
 	38587,			/* 16 */
@@ -2234,9 +2233,6 @@
 	gus_busy = 1;
 	active_device = 0;
 
-	gus_reset();
-	reset_sample_memory();
-	gus_select_max_voices(14);
 	saved_iw_mode = iw_mode;
 	if (iw_mode)
 	{
@@ -2244,6 +2240,11 @@
 		gus_write8(0x19, gus_read8(0x19) & ~0x01);	/* Disable enhanced mode */
 		iw_mode = 0;
 	}
+
+	gus_reset();
+	reset_sample_memory();
+	gus_select_max_voices(14);
+
 	pcm_active = 0;
 	dma_active = 0;
 	pcm_opened = 1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)