Commit a5053a8e authored Apr 10, 2015 by Kuninori Morimoto Committed by Mark Brown Apr 10, 2015

ASoC: core: call snd_soc_runtime_set_dai_fmt() before soc_new_pcm()



Current snd_soc_runtime_set_dai_fmt() is called after
soc_probe_link_dais(). this means snd_soc_dai_set_fmt() will be
called after soc_new_pcm().

Before appling 1efb53a2
(ASoC: simple-card: Remove support for setting differing DAI formats)
simple-card user had (1) snd_soc_dai_set_fmt() -> soc_new_pcm(),
but, after that it is (2) soc_new_pcm() -> snd_soc_dai_set_fmt().
At least rsnd driver is assuming (1) pattern.

This patch move snd_soc_dai_set_fmt() into soc_probe_link_dais()
after the dai_link->init section to solve this issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 1ddca24c

sound/soc/soc-core.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -1359,6 +1359,9 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
		}
		}

		if (dai_link->dai_fmt)
		snd_soc_runtime_set_dai_fmt(rtd, dai_link->dai_fmt);

		ret = soc_post_component_init(rtd, dai_link->name);
		if (ret)
		return ret;
		@@ -1672,12 +1675,6 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
		snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
		card->num_of_dapm_routes);

		for (i = 0; i < card->num_links; i++) {
		if (card->dai_link[i].dai_fmt)
		snd_soc_runtime_set_dai_fmt(&card->rtd[i],
		card->dai_link[i].dai_fmt);
		}

		snprintf(card->snd_card->shortname, sizeof(card->snd_card->shortname),
		"%s", card->name);
		snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),

Admin message