Merge tag 'sound-fix-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[uclinux-h8/linux.git] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index 3e0ceba..20f37fb 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -109,13 +109,12 @@ static void snd_card_id_read(struct snd_info_entry *entry,
 
 static int init_info_for_card(struct snd_card *card)
 {
-       int err;
        struct snd_info_entry *entry;
 
        entry = snd_info_create_card_entry(card, "id", card->proc_root);
        if (!entry) {
                dev_dbg(card->dev, "unable to create card entry\n");
-               return err;
+               return -ENOMEM;
        }
        entry->c.text.read = snd_card_id_read;
        card->proc_id = entry;