xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Mark Brown
2010-12-21 17:09:48 +00:00
parent 458350b31f
commit be4fcddd17
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/soc-cache.c
View File

@@ -1531,6 +1531,7 @@ static int snd_soc_flat_cache_init(struct snd_soc_codec *codec)
/* an array of all supported compression types */ /* an array of all supported compression types */
static const struct snd_soc_cache_ops cache_types[] = { static const struct snd_soc_cache_ops cache_types[] = {
/* Flat *must* be the first entry for fallback */
{ {
.id = SND_SOC_FLAT_COMPRESSION, .id = SND_SOC_FLAT_COMPRESSION,
.name = "flat", .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) for (i = 0; i < ARRAY_SIZE(cache_types); ++i)
if (cache_types[i].id == codec->compress_type) if (cache_types[i].id == codec->compress_type)
break; break;
/* Fall back to flat compression */
if (i == ARRAY_SIZE(cache_types)) { if (i == ARRAY_SIZE(cache_types)) {
dev_err(codec->dev, "Could not match compress type: %d\n", dev_warn(codec->dev, "Could not match compress type: %d\n",
codec->compress_type); codec->compress_type);
return -EINVAL; i = 0;
} }
mutex_init(&codec->cache_rw_mutex); mutex_init(&codec->cache_rw_mutex);