From 36b9a31a3787aeaeb75290304a8c5ee54237e50e Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Wed, 5 Aug 2020 10:29:54 +0800 Subject: [PATCH] asoc: lahaina: add wcd_disabled check in late_probe Add wcd_disabled check in late_probe to avoid checking wcd component when WCD is disabled. Change-Id: I9fe4fa993b94b09d7ffef0f59505b102165b87ac Signed-off-by: Meng Wang --- asoc/lahaina.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/asoc/lahaina.c b/asoc/lahaina.c index 11b8a782ec5b..081594ed4dd8 100644 --- a/asoc/lahaina.c +++ b/asoc/lahaina.c @@ -7289,9 +7289,17 @@ static int msm_snd_card_late_probe(struct snd_soc_card *card) struct snd_soc_component *component = NULL; const char *be_dl_name = LPASS_BE_RX_CDC_DMA_RX_0; struct snd_soc_pcm_runtime *rtd; + struct msm_asoc_mach_data *pdata; int ret = 0; void *mbhc_calibration; + pdata = snd_soc_card_get_drvdata(card); + if (!pdata) + return -EINVAL; + + if (pdata->wcd_disabled) + return 0; + rtd = snd_soc_get_pcm_runtime(card, be_dl_name); if (!rtd) { dev_err(card->dev,