patch-2.4.0-test2 linux/drivers/sound/emu10k1/audio.c

Next file: linux/drivers/sound/emu10k1/main.c
Previous file: linux/drivers/sound/dmasound/dmasound_core.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/sound/emu10k1/audio.c linux/drivers/sound/emu10k1/audio.c
@@ -969,12 +969,9 @@
 	if (entry == &emu10k1_devs)
 		return -ENODEV;
 
-	MOD_INC_USE_COUNT;
-
 	if ((wave_dev = (struct emu10k1_wavedevice *)
 	     kmalloc(sizeof(struct emu10k1_wavedevice), GFP_KERNEL)) == NULL) {
 		ERROR();
-		MOD_DEC_USE_COUNT;
 		return -EINVAL;
 	}
 
@@ -988,7 +985,6 @@
 
 		if ((woinst = (struct woinst *) kmalloc(sizeof(struct woinst), GFP_KERNEL)) == NULL) {
 			ERROR();
-			MOD_DEC_USE_COUNT;
 			return -ENODEV;
 		}
 
@@ -1055,7 +1051,6 @@
 
 		if ((wiinst = (struct wiinst *) kmalloc(sizeof(struct wiinst), GFP_KERNEL)) == NULL) {
 			ERROR();
-			MOD_DEC_USE_COUNT;
 			return -ENODEV;
 		}
 
@@ -1176,7 +1171,6 @@
 	kfree(wave_dev);
 
 	wake_up_interruptible(&card->open_wait);
-	MOD_DEC_USE_COUNT;
 
 	return 0;
 }
@@ -1430,6 +1424,7 @@
 }
 
 struct file_operations emu10k1_audio_fops = {
+	owner:THIS_MODULE,
 	llseek:emu10k1_audio_llseek,
 	read:emu10k1_audio_read,
 	write:emu10k1_audio_write,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)