diff options
| author | Dimitris Papastamos <dp@opensource.wolfsonmicro.com> | 2011-05-05 14:18:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-08 14:38:31 +0100 |
| commit | 64d27069755db41daa36e4770d88ebc57617559d (patch) | |
| tree | 2508aa53ec47d377c9a83cf1b51a33a195abdf00 /sound/soc | |
| parent | 77530150fba769d7b7e260b3f16ed2294c1737b6 (diff) | |
| download | linux-stable-64d27069755db41daa36e4770d88ebc57617559d.tar.gz linux-stable-64d27069755db41daa36e4770d88ebc57617559d.tar.bz2 linux-stable-64d27069755db41daa36e4770d88ebc57617559d.zip | |
ASoC: soc-cache: Allow codec->cache_bypass to be used with snd_soc_hw_bulk_write_raw()
If we specifically want to write a block of data to the hw bypassing the
cache, then allow this to happen inside snd_soc_hw_bulk_write_raw().
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-cache.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index a217db256700..687beec56476 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -404,12 +404,13 @@ static int snd_soc_hw_bulk_write_raw(struct snd_soc_codec *codec, unsigned int r { int ret; - /* Ensure that the base register is volatile. Subsequently - * any other register that is touched by this routine should be - * volatile as well to ensure that we don't get out of sync with - * the cache. + /* To ensure that we don't get out of sync with the cache, check + * whether the base register is volatile or if we've directly asked + * to bypass the cache. Out of bounds registers are considered + * volatile. */ - if (!snd_soc_codec_volatile_register(codec, reg) + if (!codec->cache_bypass + && !snd_soc_codec_volatile_register(codec, reg) && reg < codec->driver->reg_cache_size) return -EINVAL; |