aboutsummaryrefslogtreecommitdiff
path: root/sound/oss/v_midi.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/v_midi.c')
-rw-r--r--sound/oss/v_midi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c
index 077b7679766..f0b4151d9b1 100644
--- a/sound/oss/v_midi.c
+++ b/sound/oss/v_midi.c
@@ -1,5 +1,5 @@
/*
- * sound/v_midi.c
+ * sound/oss/v_midi.c
*
* The low level driver for the Sound Blaster DS chips.
*
@@ -21,6 +21,7 @@
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
#include "sound_config.h"
@@ -39,8 +40,6 @@ static void *midi_mem = NULL;
*/
-void (*midi_input_intr) (int dev, unsigned char data);
-
static int v_midi_open (int dev, int mode,
void (*input) (int dev, unsigned char data),
void (*output) (int dev)
@@ -185,7 +184,7 @@ static void __init attach_v_midi (struct address_info *hw_config)
return;
}
- m=(struct vmidi_memory *)kmalloc(sizeof(struct vmidi_memory), GFP_KERNEL);
+ m = kmalloc(sizeof(struct vmidi_memory), GFP_KERNEL);
if (m == NULL)
{
printk(KERN_WARNING "Loopback MIDI: Failed to allocate memory\n");