ASoC: cs35l41: Correct DSP power down

The wm_adsp_event should be called before the early_event on power
down, event stops the core running and early_event then powers down
the core. Additionally, the core should only be stopped if it was
actually running in the first place.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220105113026.18955-4-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c
index 980294c1bcdba0f86372265a582c0f392b8a4c88..05839fabf97bcfe8fdef9cc204820353c01fa2b7 100644 (file)
--- a/sound/soc/codecs/cs35l41.c
+++ b/sound/soc/codecs/cs35l41.c
@@ -181,17 +181,21 @@ static SOC_ENUM_SINGLE_DECL(pcm_sft_ramp,
 static int cs35l41_dsp_preload_ev(struct snd_soc_dapm_widget *w,
                                  struct snd_kcontrol *kcontrol, int event)
 {
+       struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
+       struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(component);
        int ret;
 
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
                return wm_adsp_early_event(w, kcontrol, event);
        case SND_SOC_DAPM_PRE_PMD:
-               ret = wm_adsp_early_event(w, kcontrol, event);
-               if (ret)
-                       return ret;
+               if (cs35l41->dsp.cs_dsp.running) {
+                       ret = wm_adsp_event(w, kcontrol, event);
+                       if (ret)
+                               return ret;
+               }
 
-               return wm_adsp_event(w, kcontrol, event);
+               return wm_adsp_early_event(w, kcontrol, event);
        default:
                return 0;
        }