Pull context-bitmap into release branch

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

diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index 16f3b461627ab80fa1194649af6744dba1c1fd20..9e2b4c0c8a8a98f195cd58f4d881a669d0c05e80 100644 (file)
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -22,6 +22,7 @@
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/string.h>
 #include <sound/core.h>
 #include <sound/emux_synth.h>
 #include <linux/init.h>
@@ -39,7 +40,7 @@ int snd_emux_new(snd_emux_t **remu)
        snd_emux_t *emu;
 
        *remu = NULL;
-       emu = kcalloc(1, sizeof(*emu), GFP_KERNEL);
+       emu = kzalloc(sizeof(*emu), GFP_KERNEL);
        if (emu == NULL)
                return -ENOMEM;
 
@@ -76,7 +77,7 @@ int snd_emux_register(snd_emux_t *emu, snd_card_t *card, int index, char *name)
        snd_assert(name != NULL, return -EINVAL);
 
        emu->card = card;
-       emu->name = snd_kmalloc_strdup(name, GFP_KERNEL);
+       emu->name = kstrdup(name, GFP_KERNEL);
        emu->voices = kcalloc(emu->max_voices, sizeof(snd_emux_voice_t), GFP_KERNEL);
        if (emu->voices == NULL)
                return -ENOMEM;