ASoC: wm_adsp: Move check of dsp->running to better place

In preparation for moving the generic DSP support out of ASoC, move
the check of dsp->running to a more appropriate place that will move
to the generic code.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210913160057.103842-12-simont@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index bd335e4240e5d319ccf531ea2dd4b4c3122e230e..1c8bf818dab99efcda306d3f91191d1544d249cf 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -976,6 +976,9 @@ static int cs_dsp_coeff_write_acked_control(struct cs_dsp_coeff_ctl *ctl,
        unsigned int reg;
        int i, ret;
 
+       if (!dsp->running)
+               return -EPERM;
+
        ret = cs_dsp_coeff_base_reg(ctl, &reg);
        if (ret)
                return ret;
@@ -1129,7 +1132,7 @@ static int wm_coeff_put_acked(struct snd_kcontrol *kctl,
 
        mutex_lock(&cs_ctl->dsp->pwr_lock);
 
-       if (cs_ctl->enabled && cs_ctl->dsp->running)
+       if (cs_ctl->enabled)
                ret = cs_dsp_coeff_write_acked_control(cs_ctl, val);
        else
                ret = -EPERM;