Merge branch 'ht-delete-2.6.35' into release

[pandora-kernel.git] / sound / oss / sb_midi.c

diff --git a/sound/oss/sb_midi.c b/sound/oss/sb_midi.c
index 2e3bc04..f139028 100644 (file)
--- a/sound/oss/sb_midi.c
+++ b/sound/oss/sb_midi.c
@@ -12,6 +12,7 @@
  */
 
 #include <linux/spinlock.h>
+#include <linux/slab.h>
 
 #include "sound_config.h"
 
@@ -173,7 +174,7 @@ void sb_dsp_midi_init(sb_devc * devc, struct module *owner)
                return;
        }
        std_midi_synth.midi_dev = devc->my_mididev = dev;
-       midi_devs[dev] = (struct midi_operations *)kmalloc(sizeof(struct midi_operations), GFP_KERNEL);
+       midi_devs[dev] = kmalloc(sizeof(struct midi_operations), GFP_KERNEL);
        if (midi_devs[dev] == NULL)
        {
                printk(KERN_WARNING "Sound Blaster:  failed to allocate MIDI memory.\n");
@@ -189,7 +190,7 @@ void sb_dsp_midi_init(sb_devc * devc, struct module *owner)
        midi_devs[dev]->devc = devc;
 
 
-       midi_devs[dev]->converter = (struct synth_operations *)kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
+       midi_devs[dev]->converter = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
        if (midi_devs[dev]->converter == NULL)
        {
                  printk(KERN_WARNING "Sound Blaster:  failed to allocate MIDI memory.\n");