openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: SOF: use current DAI config during resume 

Recently, the sof_pcm_dai_link_fixup() function was
updated to match SSP config with the PCM hw_params
and set the current_config for the DAI widget.

But the sof_restore_pipelines() function still chooses the
default config for the DAI widget upon resuming. Fix this
to use the last used config when setting up the DAI widget
during resume.

Fixes: c943a586f6 ("ASoC: SOF: match SSP config with pcm hw params")
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210415162107.130963-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2021-04-15 11:21:07 -05:00 committed by Mark Brown
parent 620f7c08d9
commit eea1d18e9b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,7 @@ int sof_restore_pipelines(struct device *dev)
/* restore dai links */ /* restore dai links */
list_for_each_entry_reverse(dai, &sdev->dai_list, list) { list_for_each_entry_reverse(dai, &sdev->dai_list, list) {
struct sof_ipc_reply reply; struct sof_ipc_reply reply;
struct sof_ipc_dai_config *config = dai->dai_config; struct sof_ipc_dai_config *config = &dai->dai_config[dai->current_config];
if (!config) { if (!config) {
dev_err(dev, "error: no config for DAI %s\n", dev_err(dev, "error: no config for DAI %s\n",