diff mbox series

ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback

Message ID 20240612121203.15468-1-peter.ujfalusi@linux.intel.com (mailing list archive)
State Accepted
Commit 6f2a43e3d14f6e31a3b041a1043195d02c54d615
Headers show
Series ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback | expand

Commit Message

Peter Ujfalusi June 12, 2024, 12:12 p.m. UTC 
If the ipc_prepare() callback fails for a module instance, on error rewind
we must skip the ipc_unprepare() call for ones that has positive use count.

The positive use count means that the module instance is in active use, it
cannot be unprepared.

The issue affects capture direction paths with branches (single dai with
multiple PCMs), the affected widgets are in the shared part of the paths.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 sound/soc/sof/sof-audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown June 13, 2024, 8:42 a.m. UTC | #1 
On Wed, 12 Jun 2024 15:12:03 +0300, Peter Ujfalusi wrote:
> If the ipc_prepare() callback fails for a module instance, on error rewind
> we must skip the ipc_unprepare() call for ones that has positive use count.
> 
> The positive use count means that the module instance is in active use, it
> cannot be unprepared.
> 
> The issue affects capture direction paths with branches (single dai with
> multiple PCMs), the affected widgets are in the shared part of the paths.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback
      commit: 6f2a43e3d14f6e31a3b041a1043195d02c54d615

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 881eec38c2e2..9a52781bf8d8 100644
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -485,7 +485,7 @@  sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget
 			if (ret < 0) {
 				/* unprepare the source widget */
 				if (widget_ops[widget->id].ipc_unprepare &&
-				    swidget && swidget->prepared) {
+				    swidget && swidget->prepared && swidget->use_count == 0) {
 					widget_ops[widget->id].ipc_unprepare(swidget);
 					swidget->prepared = false;
 				}