Merge branch 'for-3.0' into for-3.1

1 files changed, 3 insertions, 0 deletions

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index d8ce34c83d8b..cad70c9640dc 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -463,6 +463,9 @@ static bool snd_soc_set_cache_val(void *base, unsigned int idx,
 static unsigned int snd_soc_get_cache_val(const void *base, unsigned int idx,
                 unsigned int word_size)
 {
+        if (!base)
+                return -1;
+
         switch (word_size) {
         case 1: {
                 const u8 *cache = base;