Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b2d30fa authored by Aditya Bavanari's avatar Aditya Bavanari Committed by Meng Wang
Browse files

asoc: sm6150: Correct codec_root entry creation logic 



Create codec root entry only if it is not
created already in proc directory to avoid failures
in codec version entry enumeration.

Change-Id: I8c912be5fb0f229a3b5a088ebb5c0aeea06f67b2
Signed-off-by: default avatarAditya Bavanari <abavanar@codeaurora.org>
parent 054e70ec

asoc/sm6150.c

+20 −16
Original line number Original line Diff line number Diff line
@@ -4912,6 +4912,7 @@ static int msm_audrx_tavil_init(struct snd_soc_pcm_runtime *rtd) 
	}

	}





	card = rtd->card->snd_card;

	card = rtd->card->snd_card;

	if (!pdata->codec_root) {

		entry = snd_info_create_subdir(card->module, "codecs",

		entry = snd_info_create_subdir(card->module, "codecs",

						 card->proc_root);

						 card->proc_root);

		if (!entry) {

		if (!entry) {
@@ -4921,6 +4922,7 @@ static int msm_audrx_tavil_init(struct snd_soc_pcm_runtime *rtd) 
			goto err;

			goto err;

		}

		}

		pdata->codec_root = entry;

		pdata->codec_root = entry;

	}

	tavil_codec_info_create_codec_entry(pdata->codec_root, component);

	tavil_codec_info_create_codec_entry(pdata->codec_root, component);





	codec_reg_done = true;

	codec_reg_done = true;
@@ -5088,6 +5090,7 @@ static int msm_audrx_tasha_init(struct snd_soc_pcm_runtime *rtd) 
	}

	}





	card = rtd->card->snd_card;

	card = rtd->card->snd_card;

	if (!pdata->codec_root) {

		entry = snd_info_create_subdir(card->module, "codecs",

		entry = snd_info_create_subdir(card->module, "codecs",

						 card->proc_root);

						 card->proc_root);

		if (!entry) {

		if (!entry) {
@@ -5097,6 +5100,7 @@ static int msm_audrx_tasha_init(struct snd_soc_pcm_runtime *rtd) 
			goto err;

			goto err;

		}

		}

		pdata->codec_root = entry;

		pdata->codec_root = entry;

	}

	tasha_codec_info_create_codec_entry(pdata->codec_root, component);

	tasha_codec_info_create_codec_entry(pdata->codec_root, component);

	tasha_mbhc_zdet_gpio_ctrl(msm_config_hph_en0_gpio, component);

	tasha_mbhc_zdet_gpio_ctrl(msm_config_hph_en0_gpio, component);