Unverified Commit 8780cf11 authored by Ajit Pandey's avatar Ajit Pandey Committed by Mark Brown
Browse files

ASoC: soc-core: defer card probe until all component is added to list 



DAI component probe is not called if it is not present
in component list during sound card registration.
Check if component is available in component list for
platform and cpu dai before soundcard registration.

Signed-off-by: default avatarAjit Pandey <ajitp@codeaurora.org>
Signed-off-by: default avatarRohit kumar <rohitkr@codeaurora.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 44fabd8c

sound/soc/soc-core.c

+16 −1
Original line number Diff line number Diff line
@@ -1027,7 +1027,6 @@ static int snd_soc_init_platform(struct snd_soc_card *card, 
				 struct snd_soc_dai_link *dai_link)

{

	struct snd_soc_dai_link_component *platform = dai_link->platform;



	/*

	 * FIXME

	 *
@@ -1129,6 +1128,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, 
			link->name);

		return -EINVAL;

	}



	/*

	 * Defer card registartion if platform dai component is not added to

	 * component list.

	 */

	if (!soc_find_component(link->platform->of_node, link->platform->name))

		return -EPROBE_DEFER;



	/*

	 * CPU device may be specified by either name or OF node, but

	 * can be left unspecified, and will be matched based on DAI
@@ -1140,6 +1147,14 @@ static int soc_init_dai_link(struct snd_soc_card *card, 
			link->name);

		return -EINVAL;

	}



	/*

	 * Defer card registartion if cpu dai component is not added to

	 * component list.

	 */

	if (!soc_find_component(link->cpu_of_node, link->cpu_name))

		return -EPROBE_DEFER;



	/*

	 * At least one of CPU DAI name or CPU device name/node must be

	 * specified

CRA Git | Maintained and supported by SUSTech CRA and CCSE