summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-03 13:39:43 +0400
committerMark Brown <broonie@linaro.org>2014-06-03 13:39:43 +0400
commitb8139d0afd51b8f357a018aab68ff9c4095217be (patch)
tree6b9928dec5c840766da727691c935ff9123fb50a /sound
parentbad6f621e492f65a0bf0fbe8db1c9c7f20da6a60 (diff)
parentb5fc40d3b37bdb3524cdf1f550bd0c3b05ac3888 (diff)
downloadlinux-b8139d0afd51b8f357a018aab68ff9c4095217be.tar.xz
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-cache.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 3fa77d5f9b75..00e70b6c7da2 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -72,6 +72,9 @@ int snd_soc_cache_init(struct snd_soc_codec *codec)
reg_size = codec_drv->reg_cache_size * codec_drv->reg_word_size;
+ if (!reg_size)
+ return 0;
+
mutex_init(&codec->cache_rw_mutex);
dev_dbg(codec->dev, "ASoC: Initializing cache for %s codec\n",