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

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

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/gus_card.c linux/drivers/sound/gus_card.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 
 #include "sound_config.h"
-#include "soundmodule.h"
 
 #include "gus.h"
 #include "gus_hw.h"
@@ -184,7 +183,8 @@
 					  hw_config->irq,
 					  hw_config->dma,
 					  hw_config->dma, 0,
-					  hw_config->osp);
+					  hw_config->osp,
+					  THIS_MODULE);
 }
 
 static void __exit unload_gus_db16(struct address_info *hw_config)
@@ -259,7 +259,7 @@
 	if (!probe_gus(&cfg))
 		return -ENODEV;
 	attach_gus(&cfg);
-	SOUND_LOCK;
+
 	return 0;
 }
 
@@ -270,7 +270,6 @@
 		unload_gus_db16(&cfg);
 #endif
 	unload_gus(&cfg);
-	SOUND_LOCK_END;
 }
 
 module_init(init_gus);