diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-23 01:31:27 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-23 01:31:27 -0400 |
| commit | 42c39a6267e9d1093b7aa1915ce187d074988d1c (patch) | |
| tree | 2075190bddba157fd7b38985ddd67f8156a80124 /sound/soc/soc-cache.c | |
| parent | 391d8a04fc0f0d603642daa07f379e17c88001c9 (diff) | |
| parent | 0077ca0b5c986477e33451b797b6e7dc92a8bbc0 (diff) | |
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.c | 2 |
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, | |||
| 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->driver->reg_cache_size) | 207 | && reg < codec->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) { |