1 files changed, 10 insertions, 3 deletions

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 0e17b405042..a9ebc078bea 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -988,6 +988,7 @@ static int snd_soc_rbtree_cache_init(struct snd_soc_codec *codec)
         return 0;
 }
 
+#ifdef CONFIG_SND_SOC_CACHE_LZO
 struct snd_soc_lzo_ctx {
         void *wmem;
         void *dst;
@@ -1399,6 +1400,7 @@ err_tofree:
         }
         return ret;
 }
+#endif
 
 static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
 {
@@ -1531,6 +1533,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[] = {
+        /* Flat *must* be the first entry for fallback */
         {
                 .id = SND_SOC_FLAT_COMPRESSION,
                 .name = "flat",
@@ -1540,6 +1543,7 @@ static const struct snd_soc_cache_ops cache_types[] = {
                 .write = snd_soc_flat_cache_write,
                 .sync = snd_soc_flat_cache_sync
         },
+#ifdef CONFIG_SND_SOC_CACHE_LZO
         {
                 .id = SND_SOC_LZO_COMPRESSION,
                 .name = "LZO",
@@ -1549,6 +1553,7 @@ static const struct snd_soc_cache_ops cache_types[] = {
                 .write = snd_soc_lzo_cache_write,
                 .sync = snd_soc_lzo_cache_sync
         },
+#endif
         {
                 .id = SND_SOC_RBTREE_COMPRESSION,
                 .name = "rbtree",
@@ -1567,10 +1572,12 @@ int snd_soc_cache_init(struct snd_soc_codec *codec)
         for (i = 0; i < ARRAY_SIZE(cache_types); ++i)
                 if (cache_types[i].id == codec->compress_type)
                         break;
+
+        /* Fall back to flat compression */
         if (i == ARRAY_SIZE(cache_types)) {
-                dev_err(codec->dev, "Could not match compress type: %d\n",
-                        codec->compress_type);
-                return -EINVAL;
+                dev_warn(codec->dev, "Could not match compress type: %d\n",
+                         codec->compress_type);
+                i = 0;
         }
 
         mutex_init(&codec->cache_rw_mutex);