From 8c6bc01ef13a67db6109179428bca5846856ffae Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 Jun 2011 19:34:58 +0100
Subject: [PATCH] --- yaml --- r: 257491 b: refs/heads/master c:
 bd4f2acb8dfbff473f1abe805bca902720f653b4 h: refs/heads/master i:   257489:
 e5c2bc646edf7e9e8724b160dcd40c8db64fc7fa   257487:
 3c5e15f34442400bf96f191ac075cdb52384d50c v: v3

---
 [refs]                      | 2 +-
 trunk/sound/soc/soc-cache.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 32f281e86c89..d5ef430892fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78bf3c9ab69a957dfa58e521ce7fca056c86b980
+refs/heads/master: bd4f2acb8dfbff473f1abe805bca902720f653b4
diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c
index d8ce34c83d8b..cad70c9640dc 100644
--- a/trunk/sound/soc/soc-cache.c
+++ b/trunk/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;