A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Linux Build Service Account 2019-02-27 01:15:30 -08:00 • committed by Gerrit - the friendly Code Review server
commit 865c73dda2
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
asoc/sm6150.c
View file

@ -4913,15 +4913,17 @@ static int msm_audrx_tavil_init(struct snd_soc_pcm_runtime *rtd)
}
card = rtd->card->snd_card;
entry = snd_info_create_subdir(card->module, "codecs",
card->proc_root);
if (!entry) {
pr_debug("%s: Cannot create codecs module entry\n",
__func__);
ret = 0;
goto err;
if (!pdata->codec_root) {
entry = snd_info_create_subdir(card->module, "codecs",
card->proc_root);
if (!entry) {
pr_debug("%s: Cannot create codecs module entry\n",
__func__);
ret = 0;
goto err;
}
pdata->codec_root = entry;
}
pdata->codec_root = entry;
tavil_codec_info_create_codec_entry(pdata->codec_root, component);
codec_reg_done = true;
@ -5089,15 +5091,17 @@ static int msm_audrx_tasha_init(struct snd_soc_pcm_runtime *rtd)
}
card = rtd->card->snd_card;
entry = snd_info_create_subdir(card->module, "codecs",
card->proc_root);
if (!entry) {
pr_debug("%s: Cannot create codecs module entry\n",
__func__);
ret = 0;
goto err;
if (!pdata->codec_root) {
entry = snd_info_create_subdir(card->module, "codecs",
card->proc_root);
if (!entry) {
pr_debug("%s: Cannot create codecs module entry\n",
__func__);
ret = 0;
goto err;
}
pdata->codec_root = entry;
}
pdata->codec_root = entry;
tasha_codec_info_create_codec_entry(pdata->codec_root, component);
tasha_mbhc_zdet_gpio_ctrl(msm_config_hph_en0_gpio, component);