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

• Lines: 43
• Date: Fri Aug 11 08:26:43 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/cs4232.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/cs4232.c linux/drivers/sound/cs4232.c
@@ -46,7 +46,6 @@
 #include <linux/init.h>
 
 #include "sound_config.h"
-#include "soundmodule.h"
 
 #include "cs4232.h"
 #include "ad1848.h"
@@ -229,7 +228,8 @@
 					  dma1,		/* Playback DMA */
 					  dma2,		/* Capture DMA */
 					  0,
-					  hw_config->osp);
+					  hw_config->osp,
+					  THIS_MODULE);
 
 	if (hw_config->slots[0] != -1 &&
 		audio_devs[hw_config->slots[0]]->mixer_dev!=-1)
@@ -258,7 +258,7 @@
 		if (probe_uart401(&hw_config2))
 		{
 			mpu_detected = 1;
-			attach_uart401(&hw_config2);
+			attach_uart401(&hw_config2, THIS_MODULE);
 		}
 		else
 		{
@@ -266,7 +266,6 @@
 		}
 		hw_config->slots[1] = hw_config2.slots[1];
 	}
-	SOUND_LOCK;
 }
 
 void unload_cs4232(struct address_info *hw_config)
@@ -376,7 +375,6 @@
 static void __exit cleanup_cs4232(void)
 {
         unload_cs4232(&cfg); /* unloads MPU as well, if needed */
-	SOUND_LOCK_END;
 }
 
 module_init(init_cs4232);