Unverified Commit b1470d4c authored by Ajit Pandey's avatar Ajit Pandey Committed by Mark Brown
Browse files

ASoC: wm_adsp: Correct DSP pointer for preloader control 



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: default avatarAjit Pandey <ajit.pandey@cirrus.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent c9c9780d

sound/soc/codecs/wm_adsp.c

+6 −2
Original line number Diff line number Diff line
@@ -2643,7 +2643,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;
@@ -2655,10 +2658,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE