summaryrefslogtreecommitdiff
path: root/sound/soc/soc-cache.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-23 09:31:27 +0400
committerTakashi Iwai <tiwai@suse.de>2010-09-23 09:31:27 +0400
commit42c39a6267e9d1093b7aa1915ce187d074988d1c (patch)
tree2075190bddba157fd7b38985ddd67f8156a80124 /sound/soc/soc-cache.c
parent391d8a04fc0f0d603642daa07f379e17c88001c9 (diff)
parent0077ca0b5c986477e33451b797b6e7dc92a8bbc0 (diff)
downloadlinux-42c39a6267e9d1093b7aa1915ce187d074988d1c.tar.xz
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/soc-cache.c')
-rw-r--r--sound/soc/soc-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 6702a3dcd3fe..d4f11fbaf0f2 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -204,7 +204,7 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg,
data[2] = value & 0xff;
if (!snd_soc_codec_volatile_register(codec, reg)
- && reg < codec->driver->reg_cache_size)
+ && reg < codec->reg_cache_size)
reg_cache[reg] = value;
if (codec->cache_only) {