vserver 1.9.3

[linux-2.6.git] / sound / synth / emux / emux.c

diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 155df15..0476d06 100644 (file)
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -39,7 +39,7 @@ int snd_emux_new(snd_emux_t **remu)
        snd_emux_t *emu;
 
        *remu = NULL;
-       emu = snd_magic_kcalloc(snd_emux_t, 0, GFP_KERNEL);
+       emu = kcalloc(1, sizeof(*emu), GFP_KERNEL);
        if (emu == NULL)
                return -ENOMEM;
 
@@ -77,7 +77,7 @@ int snd_emux_register(snd_emux_t *emu, snd_card_t *card, int index, char *name)
 
        emu->card = card;
        emu->name = snd_kmalloc_strdup(name, GFP_KERNEL);
-       emu->voices = snd_kcalloc(sizeof(snd_emux_voice_t) * emu->max_voices, GFP_KERNEL);
+       emu->voices = kcalloc(emu->max_voices, sizeof(snd_emux_voice_t), GFP_KERNEL);
        if (emu->voices == NULL)
                return -ENOMEM;
 
@@ -143,7 +143,7 @@ int snd_emux_free(snd_emux_t *emu)
        if (emu->name)
                kfree(emu->name);
 
-       snd_magic_kfree(emu);
+       kfree(emu);
        return 0;
 }