redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: dapm: add initialization for w_param_text pointer 

We now allocate the array conditionally, but we always pass
the pointer to the new snd_soc_dapm_free_kcontrol() function,
which introduces a warning for the case that it is not
initialized:

sound/soc/soc-dapm.c: In function 'snd_soc_dapm_new_pcm':
sound/soc/soc-dapm.c:3940:2: error: 'w_param_text' may be used uninitialized in this function [-Werror=maybe-uninitialized]

As snd_soc_dapm_free_kcontrol() is global, it doesn't get inlined
and gcc fails to notice that we don't actually access the array
in that case, so the code is actually safe. Adding an initialization
for the array pointer shuts up the warning.

Fixes: 19ad683abc ("ASoC: dapm: Avoid creating kcontrol for params")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.1
Arnd Bergmann 2017-10-10 11:20:10 +02:00 committed by Mark Brown
parent 19ad683abc
commit 667ebc97c9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/soc-dapm.c
View File

@ -3905,6 +3905,8 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
ret = -ENOMEM;
goto param_fail;
}
} else {
w_param_text = NULL;
}
dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name);