mirror of
https://github.com/torvalds/linux
synced 2024-10-16 08:19:01 +00:00
ASoC: SOF: sof-audio: don't squelch errors in WIDGET_SETUP phase
When an IPC error happens while setting-up a widget during the FE hw_params phase, the existing logic will unwind all previous configurations but will overwrite the return status. The ALSA/ASoC logic will then proceed with the prepare and trigger phases, even though the firmware resources are not available. Fix by returning the initial error code and ignoring the code returned in the UNPREPARE phase. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Chao Song <chao.song@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://lore.kernel.org/r/20230307114659.4614-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
8bac40b8ed
commit
c7e328f1cb
|
@ -610,8 +610,8 @@ int sof_widget_list_setup(struct snd_sof_dev *sdev, struct snd_sof_pcm *spcm,
|
|||
ret = sof_walk_widgets_in_order(sdev, spcm, fe_params, platform_params,
|
||||
dir, SOF_WIDGET_SETUP);
|
||||
if (ret < 0) {
|
||||
ret = sof_walk_widgets_in_order(sdev, spcm, fe_params, platform_params,
|
||||
dir, SOF_WIDGET_UNPREPARE);
|
||||
sof_walk_widgets_in_order(sdev, spcm, fe_params, platform_params,
|
||||
dir, SOF_WIDGET_UNPREPARE);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue