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

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

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/adlib_card.c linux/drivers/sound/adlib_card.c
@@ -14,13 +14,12 @@
 #include <linux/init.h>
 
 #include "sound_config.h"
-#include "soundmodule.h"
 
 #include "opl3.h"
 
 static void __init attach_adlib_card(struct address_info *hw_config)
 {
-	hw_config->slots[0] = opl3_init(hw_config->io_base, hw_config->osp);
+	hw_config->slots[0] = opl3_init(hw_config->io_base, hw_config->osp, THIS_MODULE);
 	request_region(hw_config->io_base, 4, "OPL3/OPL2");
 }
 
@@ -50,7 +49,7 @@
 	if (probe_adlib(&cfg) == 0)
 		return -ENODEV;
 	attach_adlib_card(&cfg);
-	SOUND_LOCK;
+
 	return 0;
 }
 
@@ -59,7 +58,6 @@
 	release_region(cfg.io_base, 4);
 	sound_unload_synthdev(cfg.slots[0]);
 	
-	SOUND_LOCK_END;
 }
 
 module_init(init_adlib);