]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: dapm: Fix a couple uninitialized ret variables
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 7 Sep 2018 19:40:33 +0000 (22:40 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 10 Sep 2018 10:41:40 +0000 (11:41 +0100)
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>
sound/soc/soc-dapm.c

index e496bc642c990cb4f9fb2da06d54b3287aade4d1..0dcdcc23dcfde19b12385dd56f7fba500e6a6131 100644 (file)
@@ -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;