Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm_adsp.c

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index a7784ac15dde694565d9f0a7c71e48e82ad0d238..cfaa45ede916ae42bef79e54203ff66a50bd1e40 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -675,21 +675,12 @@ static void wm_adsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl)
 int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type,
                      unsigned int alg, void *buf, size_t len)
 {
-       struct cs_dsp_coeff_ctl *cs_ctl;
+       struct cs_dsp_coeff_ctl *cs_ctl = cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg);
        struct wm_coeff_ctl *ctl;
        struct snd_kcontrol *kcontrol;
        char ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
        int ret;
 
-       cs_ctl = cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg);
-       if (!cs_ctl)
-               return -EINVAL;
-
-       ctl = cs_ctl->priv;
-
-       if (len > cs_ctl->len)
-               return -EINVAL;
-
        ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len);
        if (ret)
                return ret;
@@ -697,6 +688,8 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type,
        if (cs_ctl->flags & WMFW_CTL_FLAG_SYS)
                return 0;
 
+       ctl = cs_ctl->priv;
+
        if (dsp->component->name_prefix)
                snprintf(ctl_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s %s",
                         dsp->component->name_prefix, ctl->name);
@@ -720,16 +713,8 @@ EXPORT_SYMBOL_GPL(wm_adsp_write_ctl);
 int wm_adsp_read_ctl(struct wm_adsp *dsp, const char *name, int type,
                     unsigned int alg, void *buf, size_t len)
 {
-       struct cs_dsp_coeff_ctl *cs_ctl;
-
-       cs_ctl = cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg);
-       if (!cs_ctl)
-               return -EINVAL;
-
-       if (len > cs_ctl->len)
-               return -EINVAL;
-
-       return cs_dsp_coeff_read_ctrl(cs_ctl, 0, buf, len);
+       return cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg),
+                                     0, buf, len);
 }
 EXPORT_SYMBOL_GPL(wm_adsp_read_ctl);