From 17130d8e4b2930e90641c9d2d800a14fbfeb2911 Mon Sep 17 00:00:00 2001 From: Prasad Kumpatla Date: Wed, 4 May 2022 18:48:16 +0530 Subject: [PATCH] asoc: kalama: 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: I0de73a09f1bdfffac1412a4c1f8f8ec5e64e4c4b Signed-off-by: Prasad Kumpatla --- asoc/kalama.c | 8 ++++++++ asoc/waipio.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/asoc/kalama.c b/asoc/kalama.c index c721bc2480..89a1780b95 100644 --- a/asoc/kalama.c +++ b/asoc/kalama.c @@ -1294,9 +1294,17 @@ static int msm_snd_card_late_probe(struct snd_soc_card *card) { struct snd_soc_component *component = NULL; 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, &card->dai_link[0]); if (!rtd) { dev_err(card->dev, diff --git a/asoc/waipio.c b/asoc/waipio.c index cfa91808f2..8b6d59a278 100644 --- a/asoc/waipio.c +++ b/asoc/waipio.c @@ -1234,9 +1234,17 @@ static int msm_snd_card_late_probe(struct snd_soc_card *card) { struct snd_soc_component *component = NULL; 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, &card->dai_link[0]); if (!rtd) { dev_err(card->dev,