From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 23 Sep 2010 05:40:16 +0000 (+0200)
Subject: ASoC: adapt multi-componentism again
X-Git-Tag: v2.6.37-rc1~126^2~1^2~73
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3e13f65e3aa51fc7009afc554683a0b182c057f5;p=linux.git

ASoC: adapt multi-componentism again

Go back to the new world order.

(Also fixed indentation.)

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index d4f11fbaf0f2..8a3f11cbcb2a 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -203,9 +203,9 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg,
 	data[1] = (value >> 8) & 0xff;
 	data[2] = value & 0xff;
 
-	if (!snd_soc_codec_volatile_register(codec, reg)
-		&& reg < codec->reg_cache_size)
-			reg_cache[reg] = value;
+	if (!snd_soc_codec_volatile_register(codec, reg) &&
+	    reg < codec->driver->reg_cache_size)
+		reg_cache[reg] = value;
 
 	if (codec->cache_only) {
 		codec->cache_sync = 1;