Skip to content

Commit

Permalink
ASoC: If we can't find a cache compression type default to flat
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Mark Brown committed Dec 21, 2010
1 parent 458350b commit be4fcdd
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions sound/soc/soc-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit be4fcdd

Please sign in to comment.