git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
sound
/
oss
/
sb_midi.c
diff --git
a/sound/oss/sb_midi.c
b/sound/oss/sb_midi.c
index
2e3bc04
..
8b79670
100644
(file)
--- a/
sound/oss/sb_midi.c
+++ b/
sound/oss/sb_midi.c
@@
-173,7
+173,7
@@
void sb_dsp_midi_init(sb_devc * devc, struct module *owner)
return;
}
std_midi_synth.midi_dev = devc->my_mididev = dev;
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");
if (midi_devs[dev] == NULL)
{
printk(KERN_WARNING "Sound Blaster: failed to allocate MIDI memory.\n");
@@
-189,7
+189,7
@@
void sb_dsp_midi_init(sb_devc * devc, struct module *owner)
midi_devs[dev]->devc = devc;
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");
if (midi_devs[dev]->converter == NULL)
{
printk(KERN_WARNING "Sound Blaster: failed to allocate MIDI memory.\n");