patch-2.1.94 linux/drivers/sound/dev_table.c

Next file: linux/drivers/sound/dev_table.h
Previous file: linux/drivers/sound/cs4232.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.93/linux/drivers/sound/dev_table.c linux/drivers/sound/dev_table.c
@@ -18,7 +18,6 @@
 #define _DEV_TABLE_C_
 #include "sound_config.h"
 
-int sb_be_quiet = 0;
 int softoss_dev = 0;
 int sound_started = 0;
 int sndtable_get_cardcount(void);
@@ -148,6 +147,9 @@
 		}
 	}
 
+        for (i=0;i<num_audiodevs;i++)
+		DMAbuf_deinit(i);
+
 	if (trace_init)
 		printk(KERN_DEBUG "Sound unload complete\n");
 }
@@ -418,13 +420,11 @@
 		return -(EBUSY);
 	}
 	d = (struct audio_driver *) (sound_mem_blocks[sound_nblocks] = vmalloc(sizeof(struct audio_driver)));
-	sound_mem_sizes[sound_nblocks] = sizeof(struct audio_driver);
 
 	if (sound_nblocks < 1024)
 		sound_nblocks++;
 
 	op = (struct audio_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc(sizeof(struct audio_operations)));
-	sound_mem_sizes[sound_nblocks] = sizeof(struct audio_operations);
 
 	if (sound_nblocks < 1024)
 		sound_nblocks++;
@@ -490,7 +490,6 @@
 	   until you unload sound! */
 	   
 	op = (struct mixer_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc(sizeof(struct mixer_operations)));
-	sound_mem_sizes[sound_nblocks] = sizeof(struct mixer_operations);
 
 	if (sound_nblocks < 1024)
 		sound_nblocks++;

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