fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / oss / v_midi.c

diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c
index 656c063..103940f 100644 (file)
--- 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.
  *
@@ -39,8 +39,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)
@@ -90,11 +88,12 @@ static void v_midi_close (int dev)
 static int v_midi_out (int dev, unsigned char midi_byte)
 {
        vmidi_devc *devc = midi_devs[dev]->devc;
-       vmidi_devc *pdevc = midi_devs[devc->pair_mididev]->devc;
+       vmidi_devc *pdevc;
 
        if (devc == NULL)
-               return -(ENXIO);
+               return -ENXIO;
 
+       pdevc = midi_devs[devc->pair_mididev]->devc;
        if (pdevc->input_opened > 0){
                if (MIDIbuf_avail(pdevc->my_mididev) > 500)
                        return 0;
@@ -184,7 +183,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");