summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorNikesh Oswal2015-02-16 16:25:48 +0100
committerMark Brown2015-02-21 10:35:19 +0100
commit65d17a9ce9f24a3aaf7d614251fdcc1b2121765f (patch)
treee5c1e7af679a29ad02736d44ae70fc6b0105a4bf /sound
parentLinux 3.19 (diff)
downloadkernel-qcow2-linux-65d17a9ce9f24a3aaf7d614251fdcc1b2121765f.tar.gz
kernel-qcow2-linux-65d17a9ce9f24a3aaf7d614251fdcc1b2121765f.tar.xz
kernel-qcow2-linux-65d17a9ce9f24a3aaf7d614251fdcc1b2121765f.zip
ASoC: wm_adsp: Ensure DSP controls are always persistent
Currently DSP controls are persistent (across DSP On/Off) only if they were set whilst the DSP is off. This change makes the controls persistent irrespective of when they are set. Signed-off-by: Nikesh Oswal <Nikesh.Oswal@wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm_adsp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 720d6e852986..14414ea23b55 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -420,10 +420,9 @@ static int wm_coeff_put(struct snd_kcontrol *kcontrol,
memcpy(ctl->cache, p, ctl->len);
- if (!ctl->enabled) {
- ctl->set = 1;
+ ctl->set = 1;
+ if (!ctl->enabled)
return 0;
- }
return wm_coeff_write_control(kcontrol, p, ctl->len);
}