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

Commit 3ea7271f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents db213e8a e496752f

sound/soc/soc-pcm.c

+12 −2
Original line number Original line Diff line number Diff line
@@ -1377,7 +1377,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 ?

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

				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;

				return be;





			for_each_rtd_codec_dai(be, i, dai) {

			for_each_rtd_codec_dai(be, i, dai) {
@@ -1396,7 +1401,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 ?

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

				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;

				return be;





			for_each_rtd_codec_dai(be, i, dai) {

			for_each_rtd_codec_dai(be, i, dai) {