evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

asoc: msm-compress: Replace goto with return in case of invalid value

Browse source 
In case of invalid values in _put() callback return directly to avoid
deadlock issue with mutex unlocking in goto label.

Change-Id: Ib0623e26dd83b96cd6ec315f515098b8ea0b2dd2
Signed-off-by: Ajit Pandey <ajitp@codeaurora.org>
Signed-off-by: Jhansi Konathala <cjkonat@codeaurora.org>
This commit is contained in:
Jhansi Konathala 2019-11-29 18:33:49 +05:30 • committed by Gerrit - the friendly Code Review server
parent 80cdbd8809
commit 6d64470424
1 changed files with 3 additions and 6 deletions

9
sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c
View file

@ -3519,8 +3519,7 @@ static int msm_compr_dec_params_put(struct snd_kcontrol *kcontrol,
if (fe_id >= MSM_FRONTEND_DAI_MAX) {
pr_err("%s Received out of bounds fe_id %lu\n",
__func__, fe_id);
rc = -EINVAL;
goto end;
return -EINVAL;
}
cstream = pdata->cstream[fe_id];
@ -3528,14 +3527,12 @@ static int msm_compr_dec_params_put(struct snd_kcontrol *kcontrol,
if (!cstream || !dec_params) {
pr_err("%s: stream or dec_params inactive\n", __func__);
rc = -EINVAL;
goto end;
return -EINVAL;
}
prtd = cstream->runtime->private_data;
if (!prtd) {
pr_err("%s: cannot set dec_params\n", __func__);
rc = -EINVAL;
goto end;
return -EINVAL;
}
mutex_lock(&pdata->lock);