patch-2.1.90 linux/drivers/sound/soundcard.c

• Lines: 79
• Date: Thu Mar 12 10:52:09 1998
• Orig file: v2.1.89/linux/drivers/sound/soundcard.c
• Orig date: Tue Mar 10 10:03:33 1998

diff -u --recursive --new-file v2.1.89/linux/drivers/sound/soundcard.c linux/drivers/sound/soundcard.c
@@ -26,7 +26,7 @@
 #include <linux/fcntl.h>
 #include <linux/ctype.h>
 #include <linux/stddef.h>
-#include <linux/kerneld.h>
+#include <linux/kmod.h>
 #ifdef __KERNEL__
 #include <asm/io.h>
 #include <asm/segment.h>
@@ -439,7 +439,7 @@
 
 	case SND_DEV_CTL:
 		dev >>= 4;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
 	if (dev >= 0 && dev < MAX_MIXER_DEV && mixer_devs[dev] == NULL) {
 		char modname[20];
 		sprintf(modname, "mixer%d", dev);
@@ -555,14 +555,14 @@
 {
  	if (mixdev < 0 || mixdev >= MAX_MIXER_DEV)
  		return -ENXIO;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
  	/* Try to load the mixer... */
  	if (mixer_devs[mixdev] == NULL) {
  		char modname[20];
  		sprintf(modname, "mixer%d", mixdev);
  		request_module(modname);
  	}
-#endif	/* CONFIG_KERNELD */
+#endif	/* CONFIG_KMOD */
  	if (mixdev >= num_mixers || !mixer_devs[mixdev])
  		return -ENXIO;
 	if (cmd == SOUND_MIXER_INFO)
@@ -801,7 +801,7 @@
 		if (irqs & (1ul << i))
 		{
 			printk(KERN_WARNING "Sound warning: IRQ%d was left allocated - fixed.\n", i);
-			snd_release_irq(i);
+			snd_release_irq(i, NULL);
 		}
 	}
 	irqs = 0;
@@ -895,14 +895,14 @@
 }
 #endif
 
-int snd_set_irq_handler(int interrupt_level, void (*iproc) (int, void *, struct pt_regs *), char *name, int *osp)
+int snd_set_irq_handler(int interrupt_level, void (*iproc) (int, void *, struct pt_regs *), char *name, int *osp, void *dev_id)
 {
-	int             retcode;
-	unsigned long   flags;
+	int retcode;
+	unsigned long flags;
 
 	save_flags(flags);
 	cli();
-	retcode = request_irq(interrupt_level, iproc, 0, name, NULL);
+	retcode = request_irq(interrupt_level, iproc, 0, name, dev_id);
 	
 	if (retcode < 0)
 	{
@@ -915,13 +915,13 @@
 	return retcode;
 }
 
-void snd_release_irq(int vect)
+void snd_release_irq(int vect, void *dev_id)
 {
 	if (!(irqs & (1ul << vect)))
 		return;
 
 	irqs &= ~(1ul << vect);
-	free_irq(vect, NULL);
+	free_irq(vect, dev_id);
 }
 
 int sound_alloc_dma(int chn, char *deviceID)