diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 19:34:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-06 19:34:58 +0100 |
| commit | bd4f2acb8dfbff473f1abe805bca902720f653b4 (patch) | |
| tree | 1a64f671d540ed36caf28c4fa834625e1955a168 /sound | |
| parent | 78bf3c9ab69a957dfa58e521ce7fca056c86b980 (diff) | |
| parent | fd137e2bba53b7207cbae6a1312e89ef3ae55624 (diff) | |
Merge branch 'for-3.0' into for-3.1
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-cache.c | 3 |
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; |