Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 6702a3dcd3fe84ae2af02f838d86468a4a2cefa6..d4f11fbaf0f225607c37bea50fb4b2cd120c5e32 100644 (file)
--- 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) {