Merge branch 'for-3.0' into for-3.1

bd4f2acb · Mark Brown · 78bf3c9a · fd137e2b · bd4f2acb
Commit bd4f2acb authored Jun 06, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sound/soc/soc-cache.c sound/soc/soc-cache.c +3 -0

No files found.
--- 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;