diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-21 17:09:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-21 23:17:05 +0000 |
| commit | be4fcddd17f01ede0ff46cf86c5ab8c5adb37175 (patch) | |
| tree | 77ddf2e02f7d54e70ea8a61bac5a02fe975945d2 /sound/soc | |
| parent | 458350b31f4f7a4d1db0c268cf1cced5afeeb8a5 (diff) | |
| download | blackbird-op-linux-be4fcddd17f01ede0ff46cf86c5ab8c5adb37175.tar.gz blackbird-op-linux-be4fcddd17f01ede0ff46cf86c5ab8c5adb37175.zip | |
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.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-cache.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 0e17b4050425..fc80be7dfd6a 100644 --- a/sound/soc/soc-cache.c +++ b/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); |
