Unverified Commit 2e558a81 authored Sep 07, 2018 by Dan Carpenter Committed by Mark Brown Sep 10, 2018

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: 3bbf5d34 ("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>

parent 3004136b

sound/soc/soc-dapm.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message