Merge branch 'for-3.0' into for-3.1

This commit is contained in:
Mark Brown 2011-06-06 19:34:58 +01:00
commit bd4f2acb8d
1 changed files with 3 additions and 0 deletions

View File

@ -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;