Commit e97fc9cf authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.2-rc8-2' of... 

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.
parents 82f1627c 1f810d2b

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -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);

	sdev = snd_soc_component_get_drvdata(cpu_dai->component);

	bus = sof_to_bus(sdev);

	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);

	hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);

	if (!hext_stream) {

	if (!hext_stream) {

		hext_stream = hda_link_stream_assign(bus, substream);

		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);

		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 */

	/* set the hdac_stream in the codec dai */

	snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream);

	snd_soc_dai_set_stream(codec_dai, hdac_stream(hext_stream), substream->stream);