leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: Fix uninintialized error return

Browse Source 
Static analysis with cppcheck found the following error:
  [sound/core/init.c:118]: (error) Uninitialized variable: err

..this was introduced by commit 2471b6c80a
("ALSA: info: Register proc entries recursively, too") where the call
to snd_info_card_register was removed and no longer setting the error
return in err.  When snd_info_create_card_entry fails to allocate a
an entry, the error path exits with garbage in err.  Fix is to return
-ENOMEM if entry fails to be allocated.

Fixes: 2471b6c80a ("ALSA: info: Register proc entries recursively, too")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Colin Ian King
2015-06-29 17:10:22 +01:00
committed by Takashi Iwai
parent 1947a114bf
commit 0755e74b8f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/core/init.c
View File

@@ -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) static int init_info_for_card(struct snd_card *card)
{ {
int err;
struct snd_info_entry *entry; struct snd_info_entry *entry;
entry = snd_info_create_card_entry(card, "id", card->proc_root); entry = snd_info_create_card_entry(card, "id", card->proc_root);
if (!entry) { if (!entry) {
dev_dbg(card->dev, "unable to create card entry\n"); dev_dbg(card->dev, "unable to create card entry\n");
return err; return -ENOMEM;
} }
entry->c.text.read = snd_card_id_read; entry->c.text.read = snd_card_id_read;
card->proc_id = entry; card->proc_id = entry;