Commit 0b07ab92 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Instantiate DAPM widgets before we do the DAI link init 



The DAI init function may want to do something that needs the widgets to
be instantiated.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f3a54a28

sound/soc/soc-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1059,6 +1059,9 @@ static int soc_post_component_init(struct snd_soc_card *card, 
	temp = codec->name_prefix;

	codec->name_prefix = NULL;



	/* Make sure all DAPM widgets are instantiated */

	snd_soc_dapm_new_widgets(&codec->dapm);



	/* do machine specific initialization */

	if (!dailess && dai_link->init)

		ret = dai_link->init(rtd);
@@ -1070,9 +1073,6 @@ static int soc_post_component_init(struct snd_soc_card *card, 
	}

	codec->name_prefix = temp;



	/* Make sure all DAPM widgets are instantiated */

	snd_soc_dapm_new_widgets(&codec->dapm);



	/* register the rtd device */

	rtd->codec = codec;

	rtd->dev.parent = card->dev;