[PATCH 2/2] ASoC: qcom: defer probe if platform dai is not registered

Rohit kumar
2018-12-24T09:02:42Z

From: Ajit Pandey <ajitp@codeaurora.org>

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

Signed-off-by: Ajit Pandey <ajitp@codeaurora.org>
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
---
sound/soc/qcom/common.c | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/sound/soc/qcom/common.c b/sound/soc/qcom/common.c
index 4715527..9e98458 100644
--- a/sound/soc/qcom/common.c
+++ b/sound/soc/qcom/common.c
@@ -11,6 +11,7 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
struct device_node *codec = NULL;
struct device_node *platform = NULL;
struct device_node *cpu = NULL;
+ struct snd_soc_component *component = NULL;
struct device *dev = card->dev;
struct snd_soc_dai_link *link;
struct of_phandle_args args;
@@ -75,6 +76,14 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
goto err;
}

+ component = snd_soc_of_lookup_component
+ (link->platform_of_node);
+ if (!component) {
+ ret = -EPROBE_DEFER;
+ dev_err(card->dev, "platform DAI not registered\n");
+ goto err;
+ }
+
ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
if (ret < 0) {
dev_err(card->dev, "codec dai not found\n");