From af18b13fedae4637b439d1265038b30929ca5a4c Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Thu, 27 Jun 2019 14:13:49 +0200 Subject: [PATCH] ASoC: soc-core: defer card registration if codec component is missing Like cpus and platforms, defer sound card initialization if the codec component is missing when initializing the dai_link Signed-off-by: Jerome Brunet Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 05cd710273b6..b5f3c09311c3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1071,12 +1071,20 @@ static int soc_init_dai_link(struct snd_soc_card *card, link->name); return -EINVAL; } + /* Codec DAI name must be specified */ if (!codec->dai_name) { dev_err(card->dev, "ASoC: codec_dai_name not set for %s\n", link->name); return -EINVAL; } + + /* + * Defer card registration if codec component is not added to + * component list. + */ + if (!soc_find_component(codec)) + return -EPROBE_DEFER; } /* -- 2.30.2