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

Unverified Commit 3f6a1252 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: core: Fix multi-CODEC setups 



Revert 10dff9b0 (ASoC: soc-core: use for_each_link_codecs() for
dai_link codecs) for now as Sylwester Nawrocki reports that it causes
oopses on at least Odroid boards.

Reported-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fe7ed4de

sound/soc/soc-core.c

+3 −2
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, 
	struct snd_soc_dai_link *dai_link)

{

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_dai_link_component *codecs;

	struct snd_soc_dai_link_component *codecs = dai_link->codecs;

	struct snd_soc_dai_link_component cpu_dai_component;

	struct snd_soc_component *component;

	struct snd_soc_dai **codec_dais;
@@ -905,8 +905,9 @@ static int soc_bind_dai_link(struct snd_soc_card *card, 
	rtd->num_codecs = dai_link->num_codecs;



	/* Find CODEC from registered CODECs */

	/* we can use for_each_rtd_codec_dai() after this */

	codec_dais = rtd->codec_dais;

	for_each_link_codecs(dai_link, i, codecs) {

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

		codec_dais[i] = snd_soc_find_dai(&codecs[i]);

		if (!codec_dais[i]) {

			dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n",