patch-2.4.0-test7 linux/drivers/sound/sgalaxy.c

• Lines: 33
• Date: Fri Aug 11 08:26:44 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/sgalaxy.c
• Orig date: Tue Mar 7 14:32:26 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/sgalaxy.c linux/drivers/sound/sgalaxy.c
@@ -22,8 +22,6 @@
 #include <linux/module.h>
 
 #include "sound_config.h"
-#include "soundmodule.h"
-
 #include "ad1848.h"
 
 static void sleep( unsigned howlong )
@@ -115,7 +113,7 @@
 	
 	request_region( ai->ai_sgbase, 0x10, "SoundGalaxy SB" );
  
-	attach_ms_sound( ai );
+	attach_ms_sound(ai, THIS_MODULE);
 	n=ai->slots[0];
 	
 	if (n!=-1 && audio_devs[n]->mixer_dev != -1 ) {
@@ -163,14 +161,12 @@
 
 	attach_sgalaxy(&cfg);
 
-	SOUND_LOCK;
 	return 0;
 }
 
 static void __exit cleanup_sgalaxy(void)
 {
 	unload_sgalaxy(&cfg);
-	SOUND_LOCK_END;
 }
 
 module_init(init_sgalaxy);