Merge "asoc: lahaina: add wcd_disabled check in late_probe" (9b9eaec1) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/lahaina.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7398,9 +7398,17 @@ static int msm_snd_card_late_probe(struct snd_soc_card *card)
	struct snd_soc_component *component = NULL;		struct snd_soc_component *component = NULL;
	const char *be_dl_name = LPASS_BE_RX_CDC_DMA_RX_0;		const char *be_dl_name = LPASS_BE_RX_CDC_DMA_RX_0;
	struct snd_soc_pcm_runtime *rtd;		struct snd_soc_pcm_runtime *rtd;
			struct msm_asoc_mach_data *pdata;
	int ret = 0;		int ret = 0;
	void *mbhc_calibration;		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);		rtd = snd_soc_get_pcm_runtime(card, be_dl_name);
	if (!rtd) {		if (!rtd) {
	dev_err(card->dev,		dev_err(card->dev,