summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-10 11:20:10 +0200
committerMark Brown <broonie@kernel.org>2017-10-10 10:26:23 +0100
commit667ebc97c99a2ea9279bf3fdd791d97adfafbbc2 (patch)
tree5916b8c12c5af8994515083b2dad6fb51ca97b58
parent19ad683abc8534cd755403381c73c0ddce7b9f6d (diff)
downloadlinux-stable-667ebc97c99a2ea9279bf3fdd791d97adfafbbc2.tar.gz
linux-stable-667ebc97c99a2ea9279bf3fdd791d97adfafbbc2.tar.bz2
linux-stable-667ebc97c99a2ea9279bf3fdd791d97adfafbbc2.zip
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: 19ad683abc85 ("ASoC: dapm: Avoid creating kcontrol for params") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 44aed3383c62..12eb74d5f5c1 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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);