patch-2.4.2 linux/drivers/sound/emu10k1/midi.c

• Lines: 26
• Date: Fri Feb 9 11:30:23 2001
• Orig file: v2.4.1/linux/drivers/sound/emu10k1/midi.c
• Orig date: Thu Sep 21 13:25:09 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/sound/emu10k1/midi.c linux/drivers/sound/emu10k1/midi.c
@@ -32,7 +32,7 @@
 
 #define __NO_VERSION__
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/version.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
@@ -85,7 +85,7 @@
 static int emu10k1_midi_open(struct inode *inode, struct file *file)
 {
 	int minor = MINOR(inode->i_rdev);
-	struct emu10k1_card *card;
+	struct emu10k1_card *card=NULL;
 	struct emu10k1_mididevice *midi_dev;
 	struct list_head *entry;
 
@@ -423,6 +423,7 @@
 		break;
 
 	default:		/* Unknown message */
+		spin_unlock_irqrestore(&midi_spinlock, flags);
 		return -1;
 	}