ASoC: Merge up left over v6.8 fix

[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 36ea0dcdc7ab0033eb48e393d783e4f7d4df9854..7d5c096e06cd32b77fc6b73f18002af63bd6c8d5 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -683,11 +683,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 = cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg);
+       struct cs_dsp_coeff_ctl *cs_ctl;
        struct wm_coeff_ctl *ctl;
        int ret;
 
        mutex_lock(&dsp->cs_dsp.pwr_lock);
+       cs_ctl = cs_dsp_get_ctl(&dsp->cs_dsp, name, type, alg);
        ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, buf, len);
        mutex_unlock(&dsp->cs_dsp.pwr_lock);
 
@@ -1092,27 +1093,36 @@ static void wm_adsp_event_post_stop(struct cs_dsp *cs_dsp)
        dsp->fatal_error = false;
 }
 
+int wm_adsp_run(struct wm_adsp *dsp)
+{
+       flush_work(&dsp->boot_work);
+
+       return cs_dsp_run(&dsp->cs_dsp);
+}
+EXPORT_SYMBOL_GPL(wm_adsp_run);
+
+void wm_adsp_stop(struct wm_adsp *dsp)
+{
+       cs_dsp_stop(&dsp->cs_dsp);
+}
+EXPORT_SYMBOL_GPL(wm_adsp_stop);
+
 int wm_adsp_event(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 wm_adsp *dsps = snd_soc_component_get_drvdata(component);
        struct wm_adsp *dsp = &dsps[w->shift];
-       int ret = 0;
 
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
-               flush_work(&dsp->boot_work);
-               ret = cs_dsp_run(&dsp->cs_dsp);
-               break;
+               return wm_adsp_run(dsp);
        case SND_SOC_DAPM_PRE_PMD:
-               cs_dsp_stop(&dsp->cs_dsp);
-               break;
+               wm_adsp_stop(dsp);
+               return 0;
        default:
-               break;
+               return 0;
        }
-
-       return ret;
 }
 EXPORT_SYMBOL_GPL(wm_adsp_event);