Merge branch 'for-3.0' into for-3.1

git-mirror · Jun 6, 2011 · bd4f2ac · bd4f2ac
2 parents 78bf3c9 + fd137e2
commit bd4f2ac
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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;