diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-02-17 10:56:33 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-02-17 10:56:33 +0300 |
| commit | e97fc9cffbb9f372b53b42c36cd7b20aab44a554 (patch) | |
| tree | 0b8eed3e6993a7b20601613044220444bc81cbde /sound | |
| parent | 82f1627cb6339ee32db22c89c750c0e359e5c72e (diff) | |
| parent | 1f810d2b6b2fbdc5279644d8b2c140b1f7c9d43d (diff) | |
| download | linux-e97fc9cffbb9f372b53b42c36cd7b20aab44a554.tar.xz | |
Merge tag 'asoc-fix-v6.2-rc8-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: One more fix for v6.2
One more fix from Peter which he'd very much like to get into
v6.2.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sof/intel/hda-dai.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index 1c3d4887aa30..a642c3067ec5 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c @@ -216,6 +216,10 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream, sdev = snd_soc_component_get_drvdata(cpu_dai->component); bus = sof_to_bus(sdev); + hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name); + if (!hlink) + return -EINVAL; + hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream); if (!hext_stream) { hext_stream = hda_link_stream_assign(bus, substream); @@ -225,10 +229,6 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream, snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)hext_stream); } - hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name); - if (!hlink) - return -EINVAL; - /* set the hdac_stream in the codec dai */ snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream); |