patch-2.1.63 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.62/linux/drivers/sound/dev_table.c linux/drivers/sound/dev_table.c
@@ -16,6 +16,7 @@
 #define _DEV_TABLE_C_
 #include "sound_config.h"
 int             sb_be_quiet = 0;
+int             softoss_dev = 0;
 
 int             sound_started = 0;
 
@@ -154,6 +155,9 @@
 	  }
       }
 
+  	for (i=0;i<num_audiodevs;i++)
+      	   DMAbuf_deinit(i);
+
   if (trace_init)
     printk ("Sound unload complete\n");
 }
@@ -163,8 +167,6 @@
 {
   int             i, drv = -1, n = num_sound_cards;
 
-  unsigned long   flags;
-
 
   DEB (printk ("unload driver %d: ", type));
 
@@ -185,11 +187,6 @@
 	  }
       }
   DEB (printk ("\n"));
-
-  save_flags (flags);
-  cli ();
-
-  restore_flags (flags);
 }
 
 
@@ -302,8 +299,7 @@
 	return 1;
       }
 
-  DEB (printk ("sndtable_init_card: No card defined with type=%d, num cards: %d\n",
-	       unit, num_sound_cards));
+  DEB (printk ("sndtable_init_card: No card defined with type=%d, num cards: %d\n", unit, num_sound_cards));
   return 0;
 }
 

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