Skip to contentSkip to conversation

ASoC: If we can't find a cache compression type default to flat

PATCH In review Mark Brown 2 participants 2 messages Dec 21, 2010

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ASoC: If we can't find a cache compression type default to flat

This makes it easier to make cache types build time configurable as we don't have a hard dependency on a given cache being built in.

---
 sound/soc/soc-cache.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
sound/soc/soc-cache.c +6 -3
index 678fd75..d78e5b7 100644
@@ -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);
Signature · 1 line
1.7.2.3
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Mark Brown

This makes it easier to make cache types build time configurable as we don't have a hard dependency on a given cache being built in.

---
 sound/soc/soc-cache.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk