From: Kuninori Morimoto Date: Wed, 7 Aug 2019 01:30:36 +0000 (+0900) Subject: ASoC: soc-core: check return value of snd_soc_add_dai_link() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b99a0aad08a3428cc3262ecee29a71c88c981c2;p=openwrt%2Fstaging%2Fblogic.git ASoC: soc-core: check return value of snd_soc_add_dai_link() snd_soc_add_dai_link() might return error, we need to check it. Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87k1bpahpd.wl-kuninori.morimoto.gx@renesas.com Reviewed-by: Ranjani Sridharan Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 5e6a48a0f79e..7345679d4903 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1964,8 +1964,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) } /* add predefined DAI links to the list */ - for_each_card_prelinks(card, i, dai_link) - snd_soc_add_dai_link(card, dai_link); + for_each_card_prelinks(card, i, dai_link) { + ret = snd_soc_add_dai_link(card, dai_link); + if (ret < 0) + goto probe_end; + } /* card bind complete so register a sound card */ ret = snd_card_new(card->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,