Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81963fed authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: compare CPU DAI stream name to find BE DAI"

parents fa101d02 f4b02527

sound/soc/soc-pcm.c

+12 −2
Original line number Diff line number Diff line
@@ -1427,7 +1427,12 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, 
				be->cpu_dai->playback_widget ?

				be->cpu_dai->playback_widget->name : "(not set)");



			if (be->cpu_dai->playback_widget == widget)

			if ((be->cpu_dai->playback_widget &&

				be->cpu_dai->playback_widget == widget &&

				(be->dai_link->stream_name &&

				!strcmp(be->dai_link->stream_name,

				   be->cpu_dai->playback_widget->sname))) ||

				be->codec_dai->playback_widget == widget)

				return be;



			for (i = 0; i < be->num_codecs; i++) {
@@ -1447,7 +1452,12 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, 
				be->cpu_dai->capture_widget ?

				be->cpu_dai->capture_widget->name : "(not set)");



			if (be->cpu_dai->capture_widget == widget)

			if ((be->cpu_dai->capture_widget &&

				be->cpu_dai->capture_widget == widget &&

				(be->dai_link->stream_name &&

				!strcmp(be->dai_link->stream_name,

				   be->cpu_dai->capture_widget->sname))) ||

				be->codec_dai->capture_widget == widget)

				return be;



			for (i = 0; i < be->num_codecs; i++) {