OSDN Git Service

asoc: msm-compress: Replace goto with return in case of invalid value
authorJhansi Konathala <cjkonat@codeaurora.org>
Fri, 29 Nov 2019 13:03:49 +0000 (18:33 +0530)
committerGerrit - the friendly Code Review server <code-review@localhost>
Sat, 25 Jan 2020 11:12:25 +0000 (03:12 -0800)
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>
sound/soc/msm/qdsp6v2/msm-compress-q6-v2.c

index 10976bf..7a2c50c 100644 (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);