diff options
| author | Mark Brown <broonie@kernel.org> | 2024-06-21 13:17:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-06-21 13:17:21 +0100 |
| commit | de7a09dec4b90a7f92b1ebcdfeed69400b5079f4 (patch) | |
| tree | 733d2f51b62d8d8213739d54d87fb1b4f2415b94 /sound/soc/sof/intel | |
| parent | ae8fc2948b48f001514d4b73167fcef3b398a5fb (diff) | |
| parent | 90f3feb24172185f1832636264943e8b5e289245 (diff) | |
ASoC: Merge up fixes
We need some of the AMD fixes as a base for new work.
Diffstat (limited to 'sound/soc/sof/intel')
| -rw-r--r-- | sound/soc/sof/intel/hda-dai.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index ce675c22a5ab..c61d298ea6b3 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -379,7 +379,7 @@ static int non_hda_dai_hw_params_data(struct snd_pcm_substream *substream, sdev = widget_to_sdev(w); if (sdev->dspless_mode_selected) - goto skip_tlv; + return 0; /* get stream_id */ hext_stream = ops->get_hext_stream(sdev, cpu_dai, substream); @@ -423,7 +423,6 @@ static int non_hda_dai_hw_params_data(struct snd_pcm_substream *substream, dma_config->dma_stream_channel_map.device_count = 1; dma_config->dma_priv_config_size = 0; -skip_tlv: return 0; } @@ -525,6 +524,9 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream, return ret; } + if (sdev->dspless_mode_selected) + return 0; + ipc4_copier = widget_to_copier(w); dma_config_tlv = &ipc4_copier->dma_config_tlv[cpu_dai_id]; dma_config = &dma_config_tlv->dma_config; |