iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: SOF: sof-audio: Set up/free DAI/AIF widgets only once

Browse Source 
Calling the sof_widget_setup/free() for the DAI/AIF widgets inside the
snd_soc_dapm_widget_for_each_sink_path() loop will end up setting up or
freeing the widget multiple times if there are multiple paths leaving
the widget. Fix this by moving the widget setup/free for the starting
widget in each path outside the loop.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230127120031.10709-4-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2023-01-27 14:00:16 +02:00 committed by Mark Brown
parent 5edcf2a3aa
commit 73ea660947
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sound/soc/sof/sof-audio.c
View File

@ -357,19 +357,16 @@ static int sof_free_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_dap
int err;
int ret = 0;
/* free all widgets even in case of error to keep use counts balanced */
snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!p->walking && p->sink->dobj.private && widget->dobj.private) {
p->walking = true;
if (WIDGET_IS_AIF_OR_DAI(widget->id)) {
err = sof_widget_free(sdev, widget->dobj.private);
if (err < 0)
ret = err;
}
if (widget->dobj.private) {
err = sof_widget_free(sdev, widget->dobj.private);
if (err < 0)
ret = err;
}
err = sof_widget_free(sdev, p->sink->dobj.private);
if (err < 0)
ret = err;
/* free all widgets in the sink paths even in case of error to keep use counts balanced */
snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!p->walking) {
p->walking = true;
err = sof_free_widgets_in_path(sdev, p->sink, dir);
if (err < 0)
@ -392,32 +389,23 @@ static int sof_set_up_widgets_in_path(struct snd_sof_dev *sdev, struct snd_soc_d
struct snd_soc_dapm_path *p;
int ret;
snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!p->walking && p->sink->dobj.private && widget->dobj.private) {
p->walking = true;
if (WIDGET_IS_AIF_OR_DAI(widget->id)) {
ret = sof_widget_setup(sdev, widget->dobj.private);
if (ret < 0)
goto out;
}
if (widget->dobj.private) {
ret = sof_widget_setup(sdev, widget->dobj.private);
if (ret < 0)
return ret;
}
ret = sof_widget_setup(sdev, p->sink->dobj.private);
if (ret < 0) {
if (WIDGET_IS_AIF_OR_DAI(widget->id))
sof_widget_free(sdev, widget->dobj.private);
goto out;
}
snd_soc_dapm_widget_for_each_sink_path(widget, p) {
if (!p->walking) {
p->walking = true;
ret = sof_set_up_widgets_in_path(sdev, p->sink, dir);
if (ret < 0) {
if (WIDGET_IS_AIF_OR_DAI(widget->id))
sof_widget_free(sdev, widget->dobj.private);
sof_widget_free(sdev, p->sink->dobj.private);
}
out:
p->walking = false;
if (ret < 0)
if (ret < 0) {
if (widget->dobj.private)
sof_widget_free(sdev, widget->dobj.private);
return ret;
}
}
}