aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-cache.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-23 01:40:16 -0400
committerTakashi Iwai <tiwai@suse.de>2010-09-23 01:41:37 -0400
commit3e13f65e3aa51fc7009afc554683a0b182c057f5 (patch)
treebfc3430b84d696842dac4cb2ebf93f41398a6ff3 /sound/soc/soc-cache.c
parent42c39a6267e9d1093b7aa1915ce187d074988d1c (diff)
ASoC: adapt multi-componentism again
Go back to the new world order. (Also fixed indentation.) Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/soc-cache.c')
-rw-r--r--sound/soc/soc-cache.c6
1 files changed, 3 insertions, 3 deletions
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,
203 data[1] = (value >> 8) & 0xff; 203 data[1] = (value >> 8) & 0xff;
204 data[2] = value & 0xff; 204 data[2] = value & 0xff;
205 205
206 if (!snd_soc_codec_volatile_register(codec, reg) 206 if (!snd_soc_codec_volatile_register(codec, reg) &&
207 && reg < codec->reg_cache_size) 207 reg < codec->driver->reg_cache_size)
208 reg_cache[reg] = value; 208 reg_cache[reg] = value;
209 209
210 if (codec->cache_only) { 210 if (codec->cache_only) {
211 codec->cache_sync = 1; 211 codec->cache_sync = 1;