aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitris Papastamos <dp@opensource.wolfsonmicro.com>2010-11-29 10:54:28 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-29 12:43:52 +0000
commitdf0701bb8660107e811bddba6e4933385f697a21 (patch)
tree908b4c9a6abb198ce9a770461d58a7cd118afb5f
parentASoC: soc-cache: Add error checking in the *_cache_sync functions (diff)
downloadlinux-dev-df0701bb8660107e811bddba6e4933385f697a21.tar.xz
linux-dev-df0701bb8660107e811bddba6e4933385f697a21.zip
ASoC: soc-cache: Ensure consistent cache naming
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/sound/soc.h2
-rw-r--r--sound/soc/soc-cache.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 3eb92ef6c83f..9e593cf1440b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -256,7 +256,7 @@ enum snd_soc_control_type {
};
enum snd_soc_compress_type {
- SND_SOC_NO_COMPRESSION,
+ SND_SOC_FLAT_COMPRESSION,
SND_SOC_LZO_COMPRESSION,
SND_SOC_RBTREE_COMPRESSION
};
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index e5b18889a493..9b1ba33e6fe9 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -1520,7 +1520,7 @@ static int snd_soc_flat_cache_init(struct snd_soc_codec *codec)
/* an array of all supported compression types */
static const struct snd_soc_cache_ops cache_types[] = {
{
- .id = SND_SOC_NO_COMPRESSION,
+ .id = SND_SOC_FLAT_COMPRESSION,
.init = snd_soc_flat_cache_init,
.exit = snd_soc_flat_cache_exit,
.read = snd_soc_flat_cache_read,