summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2018-09-07 22:40:33 +0300
committerMark Brown <broonie@kernel.org>2018-09-10 11:41:40 +0100
commit2e558a8127de7b2ed3302f9adcf332ba3feeadb2 (patch)
treef2de80816c7a82f2a24962922974c750407fd2b8 /sound/soc/soc-dapm.c
parent3004136b90bedc9e254ff659adb7a60299e9495e (diff)
downloadlinux-2e558a8127de7b2ed3302f9adcf332ba3feeadb2.tar.bz2
ASoC: dapm: Fix a couple uninitialized ret variables
Smatch complains that these variables could be uninitialized. The first one in snd_soc_dai_link_event() is probably a false positive, because probably we know the lists are not empty. I would normally ignore the warning, but GCC complains here as well so I just silenced the warning. The "ret" in snd_soc_dapm_new_dai() does need to be initialized or it leads to a bogus dereference in the caller. Fixes: 3bbf5d34fd4a ("ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index e496bc642c99..0dcdcc23dcfd 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3938,8 +3938,10 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd,
dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name);
w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template);
- if (IS_ERR(w))
+ if (IS_ERR(w)) {
+ ret = PTR_ERR(w);
goto outfree_kcontrol_news;
+ }
w->priv = rtd;