From 008745f33b45fcf46d87437e83dfccb83236d1d3 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 10 Oct 2023 11:07:40 -0400 Subject: [PATCH 1/2] fixup! ASoC: SOF: Intel: hda-dai: fix channel map configuration for aggregated dailink Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/intel/hda-dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 18076950bac58e..f1e94b362857a3 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -434,7 +434,7 @@ int sdw_hda_dai_hw_params(struct snd_pcm_substream *substream, int link_id) { struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(cpu_dai, substream->stream); - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); const struct hda_dai_widget_dma_ops *ops; struct hdac_ext_stream *hext_stream; struct snd_soc_dai *codec_dai; From cda56656eddd8ee2c0d104d6803584560644903d Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 10 Oct 2023 11:09:13 -0400 Subject: [PATCH 2/2] fixup! ASoC: SOF: Intel: hda-dai-ops: fix HDaudio link format Signed-off-by: Pierre-Louis Bossart --- sound/soc/sof/intel/hda-dai-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda-dai-ops.c b/sound/soc/sof/intel/hda-dai-ops.c index 63c701ba2ea6ce..9399b47cf644e1 100644 --- a/sound/soc/sof/intel/hda-dai-ops.c +++ b/sound/soc/sof/intel/hda-dai-ops.c @@ -237,7 +237,7 @@ static unsigned int generic_calc_stream_format(struct snd_sof_dev *sdev, struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); struct snd_soc_dai *codec_dai; unsigned int format_val; u32 ch_mask = 0;