]> git.hungrycats.org Git - linux/commitdiff
ASoC: wm_adsp: Correct DSP pointer for preloader control
authorAjit Pandey <ajit.pandey@cirrus.com>
Tue, 7 Aug 2018 17:30:42 +0000 (18:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Sep 2018 07:29:50 +0000 (09:29 +0200)
commit b1470d4ce77c2d60661c7d5325d4fb8063e15ff8 upstream.

The offset of the DSP core needs to be taken into account for the DSP
preloader control get and put. Currently the dsp->preloaded variable
will only ever be read/updated on the first DSP, whilst this doesn't
affect the operation of the control the readback will be incorrect.

Signed-off-by: Ajit Pandey <ajit.pandey@cirrus.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/codecs/wm_adsp.c

index 2fcdd84021a565b36f46b3858a0f28aaae88c411..86c7805da99767c3603b5fd218e58271e6233767 100644 (file)
@@ -2642,7 +2642,10 @@ int wm_adsp2_preloader_get(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
-       struct wm_adsp *dsp = snd_soc_component_get_drvdata(component);
+       struct wm_adsp *dsps = snd_soc_component_get_drvdata(component);
+       struct soc_mixer_control *mc =
+               (struct soc_mixer_control *)kcontrol->private_value;
+       struct wm_adsp *dsp = &dsps[mc->shift - 1];
 
        ucontrol->value.integer.value[0] = dsp->preloaded;
 
@@ -2654,10 +2657,11 @@ int wm_adsp2_preloader_put(struct snd_kcontrol *kcontrol,
                           struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
-       struct wm_adsp *dsp = snd_soc_component_get_drvdata(component);
+       struct wm_adsp *dsps = snd_soc_component_get_drvdata(component);
        struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
        struct soc_mixer_control *mc =
                (struct soc_mixer_control *)kcontrol->private_value;
+       struct wm_adsp *dsp = &dsps[mc->shift - 1];
        char preload[32];
 
        snprintf(preload, ARRAY_SIZE(preload), "DSP%u Preload", mc->shift);