diff options
| author | Charles Keepax | 2017-03-06 17:54:33 +0100 |
|---|---|---|
| committer | Mark Brown | 2017-03-07 13:07:58 +0100 |
| commit | 67430a39ca7a6af28aade5acb92d43ee257c1014 (patch) | |
| tree | f01f19d431c4ecb390f5d10c33c01a722b422caf /sound | |
| parent | Linux 4.11-rc1 (diff) | |
| download | kernel-qcow2-linux-67430a39ca7a6af28aade5acb92d43ee257c1014.tar.gz kernel-qcow2-linux-67430a39ca7a6af28aade5acb92d43ee257c1014.tar.xz kernel-qcow2-linux-67430a39ca7a6af28aade5acb92d43ee257c1014.zip | |
ASoC: wm_adsp: Return an error on write to a disabled volatile control
Volatile controls should only be accessed when the firmware is active,
currently however writes to these controls will succeed, but the data
will be lost, if the firmware is powered down. Update this behaviour such
that an error is returned the same as it is for reads.
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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index d151224ffcca..6313b3da967b 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -899,7 +899,10 @@ static int wm_coeff_put(struct snd_kcontrol *kctl, mutex_lock(&ctl->dsp->pwr_lock); - memcpy(ctl->cache, p, ctl->len); + if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) + ret = -EPERM; + else + memcpy(ctl->cache, p, ctl->len); ctl->set = 1; if (ctl->enabled && ctl->dsp->running) @@ -926,6 +929,8 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl, ctl->set = 1; if (ctl->enabled && ctl->dsp->running) ret = wm_coeff_write_control(ctl, ctl->cache, size); + else if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) + ret = -EPERM; } mutex_unlock(&ctl->dsp->pwr_lock); |