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

• Lines: 45
• Date: Fri Aug 11 08:26:43 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/sb_mixer.c
• Orig date: Tue Apr 11 15:09:19 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/sb_mixer.c linux/drivers/sound/sb_mixer.c
@@ -626,16 +626,18 @@
 
 static struct mixer_operations sb_mixer_operations =
 {
-	"SB",
-	"Sound Blaster",
-	sb_mixer_ioctl
+	owner:	THIS_MODULE,
+	id:	"SB",
+	name:	"Sound Blaster",
+	ioctl:	sb_mixer_ioctl
 };
 
 static struct mixer_operations als007_mixer_operations =
 {
-	"ALS007",
-	"Avance ALS-007",
-	sb_mixer_ioctl
+	owner:	THIS_MODULE,
+	id:	"ALS007",
+	name:	"Avance ALS-007",
+	ioctl:	sb_mixer_ioctl
 };
 
 static void sb_mixer_reset(sb_devc * devc)
@@ -658,7 +660,7 @@
 	};
 }
 
-int sb_mixer_init(sb_devc * devc)
+int sb_mixer_init(sb_devc * devc, struct module *owner)
 {
 	int mixer_type = 0;
 	int m;
@@ -735,6 +737,10 @@
 		memcpy ((char *) mixer_devs[m], (char *) &als007_mixer_operations, sizeof (struct mixer_operations));
 
 	mixer_devs[m]->devc = devc;
+
+	if (owner)
+			 mixer_devs[m]->owner = owner;
+	
 	devc->my_mixerdev = m;
 	sb_mixer_reset(devc);
 	return 1;