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>

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index b54b3d280297850ad79cef363357c23f55a4bd61..534f004f61622186bcb6209388a3d56071465182 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -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);