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

Commit 865c73dd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: sm6150: Correct codec_root entry creation logic"

parents 23ce3cad 5b2d30fa

asoc/sm6150.c

+20 −16
Original line number Original line Diff line number Diff line
@@ -4913,6 +4913,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) {
@@ -4922,6 +4923,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;
@@ -5089,6 +5091,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) {
@@ -5098,6 +5101,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);