Merge "ASoC: Resolve error logs printed at bootup"

Tento commit je obsažen v:
qctecmdr
2020-06-29 11:21:30 -07:00
odevzdal Gerrit - the friendly Code Review server
2 změnil soubory, kde provedl 1 přidání a 2 odebrání

Zobrazit soubor

@@ -27962,7 +27962,6 @@ static const struct snd_soc_dapm_route intercon[] = {
{"MM_UL20", NULL, "MultiMedia20 Mixer"},
{"MM_UL21", NULL, "MultiMedia21 Mixer"},
{"MM_UL22", NULL, "MultiMedia22 Mixer"},
{"MM_UL23", NULL, "MultiMedia23 Mixer"},
{"MM_UL24", NULL, "MultiMedia24 Mixer"},
{"MM_UL25", NULL, "MultiMedia25 Mixer"},
{"MM_UL27", NULL, "MultiMedia27 Mixer"},

Zobrazit soubor

@@ -536,7 +536,7 @@ static int msm_qti_pp_get_rms_value_control(struct snd_kcontrol *kcontrol,
break;
}
if ((be_idx >= MSM_BACKEND_DAI_MAX) || !msm_bedai.active) {
pr_err("%s, back not active to query rms be_idx:%d\n",
pr_debug("%s, back not active to query rms be_idx:%d\n",
__func__, be_idx);
rc = -EINVAL;
goto get_rms_value_err;