summaryrefslogtreecommitdiffstats
path: root/sound/soc/sof/sof-audio.c
diff options
context:
space:
mode:
authorRander Wang <rander.wang@intel.com>2022-09-20 17:01:07 +0200
committerMark Brown <broonie@kernel.org>2022-09-20 19:07:34 +0100
commit9862dcf70245c2d03764012b81966d8c2ea95a48 (patch)
tree813b26170f7be18e0190df6ed584695f54a5f4cc /sound/soc/sof/sof-audio.c
parentce59804d26432d7e2c1a8c906245a230a2b4505c (diff)
downloadlinux-stable-9862dcf70245c2d03764012b81966d8c2ea95a48.tar.gz
linux-stable-9862dcf70245c2d03764012b81966d8c2ea95a48.tar.bz2
linux-stable-9862dcf70245c2d03764012b81966d8c2ea95a48.zip
ASoC: SOF: don't unprepare widget used other pipelines
If multiple pipeline are mixed into one, we can't unprepare the widget used by other pipelines. This patch checks use_count to address this case. Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20220920150107.2090695-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/sof-audio.c')
-rw-r--r--sound/soc/sof/sof-audio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 71cea83889fb..62092e2d609c 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -271,8 +271,8 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg
struct snd_sof_widget *swidget = widget->dobj.private;
struct snd_soc_dapm_path *p;
- /* it is already unprepared */
- if (!swidget->prepared)
+ /* return if the widget is in use or if it is already unprepared */
+ if (!swidget->prepared || swidget->use_count > 1)
return;
if (widget_ops[widget->id].ipc_unprepare)