patch-2.4.0-test5 linux/drivers/sound/sound_core.c

• Lines: 40
• Date: Mon Jul 24 17:04:12 2000
• Orig file: v2.4.0-test4/linux/drivers/sound/sound_core.c
• Orig date: Mon Jul 10 16:47:24 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/sound/sound_core.c linux/drivers/sound/sound_core.c
@@ -479,6 +479,7 @@
 	int chain;
 	int unit=MINOR(inode->i_rdev);
 	struct sound_unit *s;
+	struct file_operations *new_fops = NULL;
 
 	chain=unit&0x0F;
 	if(chain==4 || chain==5)	/* dsp/audio/dsp16 */
@@ -490,7 +491,9 @@
 	
 	spin_lock(&sound_loader_lock);
 	s = __look_for_unit(chain, unit);
-	if (s == NULL) {
+	if (s)
+		new_fops = fops_get(s->unit_fops);
+	if (!new_fops) {
 		char mod[32];
 	
 		spin_unlock(&sound_loader_lock);
@@ -507,8 +510,10 @@
 		request_module(mod);
 		spin_lock(&sound_loader_lock);
 		s = __look_for_unit(chain, unit);
+		if (s)
+			new_fops = fops_get(s->unit_fops);
 	}
-	if (s) {
+	if (new_fops) {
 		/*
 		 * We rely upon the fact that we can't be unloaded while the
 		 * subdriver is there, so if ->open() is successful we can
@@ -518,7 +523,7 @@
 		 */
 		int err = 0;
 		struct file_operations *old_fops = file->f_op;
-		file->f_op = fops_get(s->unit_fops);
+		file->f_op = new_fops;
 		spin_unlock(&sound_loader_lock);
 		if(file->f_op->open)
 			err = file->f_op->open(inode,file);