From 3ab75f3ed63f39f14217556bfa62d5c1e624e232 Mon Sep 17 00:00:00 2001 From: Ranjani Sridharan Date: Mon, 27 Sep 2021 20:28:29 -0700 Subject: [PATCH] fixup! ASoC: SOF: sof-audio: setup sched widgets during pipeline complete step Move the check for scheduler widget outside the check for DAI widget. This fixes pipeline set up failure with older FW. Signed-off-by: Ranjani Sridharan --- sound/soc/sof/sof-audio.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index 328371dae27bd6..e00ce275052f9e 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -656,6 +656,14 @@ int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify) if (!verify && swidget->dynamic_pipeline_widget) continue; + /* + * For older firmware, skip scheduler widgets in this loop, + * sof_widget_setup() will be called in the 'complete pipeline' loop + */ + if (v->abi_version < SOF_ABI_VER(3, 19, 0) && + swidget->id == snd_soc_dapm_scheduler) + continue; + /* update DAI config. The IPC will be sent in sof_widget_setup() */ if (WIDGET_IS_DAI(swidget->id)) { struct snd_sof_dai *dai = swidget->private; @@ -664,14 +672,6 @@ int sof_set_up_pipelines(struct snd_sof_dev *sdev, bool verify) if (!dai || !dai->dai_config) continue; - /* - * For older firmware, skip scheduler widgets in this loop, - * sof_widget_setup() will be called in the 'complete pipeline' loop - */ - if (v->abi_version < SOF_ABI_VER(3, 19, 0) && - swidget->id == snd_soc_dapm_scheduler) - continue; - config = dai->dai_config; /* * The link DMA channel would be invalidated for running