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

Commit ccda2872 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: compare CPU DAI stream name to find BE DAI" into msm-4.8

parents f0deaf9c 4eff0795

sound/soc/soc-pcm.c

+10 −2
Original line number Diff line number Diff line
@@ -1345,7 +1345,11 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, 
			if (!be->dai_link->no_pcm)

				continue;



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

			if ((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++) {
@@ -1361,7 +1365,11 @@ static struct snd_soc_pcm_runtime *dpcm_get_be(struct snd_soc_card *card, 
			if (!be->dai_link->no_pcm)

				continue;



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

			if ((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++) {