diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-10 17:49:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-10 17:49:34 +0200 |
| commit | 05e205429d3f73ad4f9f0d84e8a95e978237d6fd (patch) | |
| tree | 558ded377d3deafcc8397b72ae6f696cdc55a713 /sound/soc/soc-cache.c | |
| parent | ALSA: hda: Fix inaudible internal speakers on CyberpowerPC Gamer Xplorer N570... (diff) | |
| parent | ASoC: SAMSUNG: Fix the incorrect referencing of I2SCON register (diff) | |
| download | linux-05e205429d3f73ad4f9f0d84e8a95e978237d6fd.tar.xz linux-05e205429d3f73ad4f9f0d84e8a95e978237d6fd.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/soc-cache.c')
| -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 06b7b81a1601..c005ceb70c9d 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -466,6 +466,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; |