diff options
| author | Peter Ujfalusi <peter.ujfalusi@linux.intel.com> | 2024-06-12 15:12:03 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-12 18:26:30 +0100 |
| commit | 6f2a43e3d14f6e31a3b041a1043195d02c54d615 (patch) | |
| tree | cf720560cea6c1545768deb3be4d4705a2d4b843 /sound/soc/sof/sof-audio.c | |
| parent | 37a2c94c68ce543bc7e2105d5ab178b03bafc797 (diff) | |
| download | linux-6f2a43e3d14f6e31a3b041a1043195d02c54d615.tar.gz linux-6f2a43e3d14f6e31a3b041a1043195d02c54d615.tar.bz2 linux-6f2a43e3d14f6e31a3b041a1043195d02c54d615.zip | |
ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback
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>
Link: https://lore.kernel.org/r/20240612121203.15468-1-peter.ujfalusi@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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index b3ac040811e7..ef9318947d74 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -485,7 +485,7 @@ sink_prepare: 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; } |