ASoC: SOF: sof-audio: Set up/free DAI/AIF widgets only once

Calling the sof_widget_setup/free() for the DAI/AIF widgets inside the
snd_soc_dapm_widget_for_each_sink_path() loop will end up setting up or
freeing the widget multiple times if there are multiple paths leaving
the widget. Fix this by moving the widget setup/free for the starting
widget in each path outside the loop.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230127120031.10709-4-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index f17d405..d242a30 100644 (file)
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -357,19 +357,16 @@ static int sof_free_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dap
        int err;
        int ret = 0;
 
-       /* free all widgets even in case of error to keep use counts balanced */
+       if (widget->dobj.private) {
+               err = sof_widget_free(sdev, widget->dobj.private);
+               if (err < 0)
+                       ret = err;
+       }
+
+       /* free all widgets in the sink paths even in case of error to keep use counts balanced */
        snd_soc_dapm_widget_for_each_sink_path(widget, p) {
-               if (!p->walking && p->sink->dobj.private && widget->dobj.private) {
+               if (!p->walking) {
                        p->walking = true;
-                       if (WIDGET_IS_AIF_OR_DAI(widget->id)) {
-                               err = sof_widget_free(sdev, widget->dobj.private);
-                               if (err < 0)
-                                       ret = err;
-                       }
-
-                       err = sof_widget_free(sdev, p->sink->dobj.private);
-                       if (err < 0)
-                               ret = err;
 
                        err = sof_free_widgets_in_path(sdev, p->sink, dir);
                        if (err < 0)
@@ -392,32 +389,23 @@ static int sof_set_up_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_d
        struct snd_soc_dapm_path *p;
        int ret;
 
+       if (widget->dobj.private) {
+               ret = sof_widget_setup(sdev, widget->dobj.private);
+               if (ret < 0)
+                       return ret;
+       }
+
        snd_soc_dapm_widget_for_each_sink_path(widget, p) {
-               if (!p->walking && p->sink->dobj.private && widget->dobj.private) {
+               if (!p->walking) {
                        p->walking = true;
-                       if (WIDGET_IS_AIF_OR_DAI(widget->id)) {
-                               ret = sof_widget_setup(sdev, widget->dobj.private);
-                               if (ret < 0)
-                                       goto out;
-                       }
-
-                       ret = sof_widget_setup(sdev, p->sink->dobj.private);
-                       if (ret < 0) {
-                               if (WIDGET_IS_AIF_OR_DAI(widget->id))
-                                       sof_widget_free(sdev, widget->dobj.private);
-                               goto out;
-                       }
 
                        ret = sof_set_up_widgets_in_path(sdev, p->sink, dir);
+                       p->walking = false;
                        if (ret < 0) {
-                               if (WIDGET_IS_AIF_OR_DAI(widget->id))
+                               if (widget->dobj.private)
                                        sof_widget_free(sdev, widget->dobj.private);
-                               sof_widget_free(sdev, p->sink->dobj.private);
-                       }
-out:
-                       p->walking = false;
-                       if (ret < 0)
                                return ret;
+                       }
                }
        }