ASoC: SOF: sof-audio: Skip unprepare for in-use widgets on error rollback
Subsystems (3)
Peter Ujfalusi
maintainerPATCH 1/1 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 <[email protected]>
Reviewed-by Pierre-Louis Bossart <[email protected]>
Reviewed-by Kai Vehmanen <[email protected]>
Reviewed-by Ranjani Sridharan <[email protected]>
--- sound/soc/sof/sof-audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/sof-audio.c +1 -1
@@ -485,7 +485,7 @@ sof_prepare_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dapm_widgetif (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; }
Signature · 1 line
2.45.1