ASoC: SOF: topology: return error if sof_connect_dai_widget() fails
Return the error if sof_connect_dai_widget() fails to abort topology loading and prevent card registration. Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20211004212729.199550-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
ea6bfbbe3e
Коммит
4a23076987
|
@ -2379,13 +2379,14 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index,
|
|||
}
|
||||
|
||||
ret = sof_widget_load_dai(scomp, index, swidget, tw, dai);
|
||||
if (ret == 0) {
|
||||
sof_connect_dai_widget(scomp, w, tw, dai);
|
||||
list_add(&dai->list, &sdev->dai_list);
|
||||
swidget->private = dai;
|
||||
} else {
|
||||
if (!ret)
|
||||
ret = sof_connect_dai_widget(scomp, w, tw, dai);
|
||||
if (ret < 0) {
|
||||
kfree(dai);
|
||||
break;
|
||||
}
|
||||
list_add(&dai->list, &sdev->dai_list);
|
||||
swidget->private = dai;
|
||||
break;
|
||||
case snd_soc_dapm_mixer:
|
||||
ret = sof_widget_load_mixer(scomp, index, swidget, tw);
|
||||
|
|
Загрузка…
Ссылка в новой задаче