This is a note to let you know that I've just added the patch titled
ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-sof-sof-audio-unprepare-when-swidget-use_count-0.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7d2a67e02549c4b1feaac4d8b4151bf46424a047 Mon Sep 17 00:00:00 2001
From: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
Date: Wed, 18 Jan 2023 12:12:53 +0200
Subject: ASoC: SOF: sof-audio: unprepare when swidget->use_count > 0
From: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
commit 7d2a67e02549c4b1feaac4d8b4151bf46424a047 upstream.
We should unprepare the widget if its use_count = 1.
Fixes: 9862dcf70245 ("ASoC: SOF: don't unprepare widget used other pipelines")
Cc: <stable@xxxxxxxxxxxxxxx> # 6.1
Signed-off-by: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@xxxxxxxxxxxxxxx>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
Reviewed-by: Rander Wang <rander.wang@xxxxxxxxx>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230118101255.29139-2-peter.ujfalusi@xxxxxxxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/sof/sof-audio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 7306a2649857..e52ef62ce7a3 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -272,7 +272,7 @@ sof_unprepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widg
struct snd_soc_dapm_path *p;
/* return if the widget is in use or if it is already unprepared */
- if (!swidget->prepared || swidget->use_count > 1)
+ if (!swidget->prepared || swidget->use_count > 0)
return;
if (widget_ops[widget->id].ipc_unprepare)
--
2.39.1
Patches currently in stable-queue which might be from yung-chuan.liao@xxxxxxxxxxxxxxx are
queue-6.1/asoc-sof-keep-prepare-unprepare-widgets-in-sink-path.patch
queue-6.1/asoc-sof-sof-audio-unprepare-when-swidget-use_count-0.patch
