Skip to content

Commit e97fc9c

Browse files
committed
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.
2 parents 82f1627 + 1f810d2 commit e97fc9c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

sound/soc/sof/intel/hda-dai.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream,
216216
sdev = snd_soc_component_get_drvdata(cpu_dai->component);
217217
bus = sof_to_bus(sdev);
218218

219+
hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);
220+
if (!hlink)
221+
return -EINVAL;
222+
219223
hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);
220224
if (!hext_stream) {
221225
hext_stream = hda_link_stream_assign(bus, substream);
@@ -225,10 +229,6 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream,
225229
snd_soc_dai_set_dma_data(cpu_dai, substream, (void *)hext_stream);
226230
}
227231

228-
hlink = snd_hdac_ext_bus_get_hlink_by_name(bus, codec_dai->component->name);
229-
if (!hlink)
230-
return -EINVAL;
231-
232232
/* set the hdac_stream in the codec dai */
233233
snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream);
234234

0 commit comments

Comments
 (0)