From ef7c1d0b1de10b830f69c14d4fc2bcb4d0bbbc5f Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 21 Dec 2010 17:09:48 +0000
Subject: [PATCH] --- yaml --- r: 230435 b: refs/heads/master c:
 be4fcddd17f01ede0ff46cf86c5ab8c5adb37175 h: refs/heads/master i:   230433:
 2da41410132248fb3f6f4ba46b61d88905ad08e7   230431:
 1eb723ab23d19e2ff827d07585abe70b3412aefa v: v3

---
 [refs]                      | 2 +-
 trunk/sound/soc/soc-cache.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ce541a9b0425..fb357f9920eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 458350b31f4f7a4d1db0c268cf1cced5afeeb8a5
+refs/heads/master: be4fcddd17f01ede0ff46cf86c5ab8c5adb37175
diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c
index 0e17b4050425..fc80be7dfd6a 100644
--- a/trunk/sound/soc/soc-cache.c
+++ b/trunk/sound/soc/soc-cache.c
@@ -1531,6 +1531,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",
@@ -1567,10 +1568,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);