diff options
| author | Takashi Iwai | 2010-09-23 07:31:27 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2010-09-23 07:31:27 +0200 |
| commit | 42c39a6267e9d1093b7aa1915ce187d074988d1c (patch) | |
| tree | 2075190bddba157fd7b38985ddd67f8156a80124 | |
| parent | ASoC: Return -1 instead of -EINVAL to ensure consistency (diff) | |
| parent | ASoC: Fix multi-componentism (diff) | |
| download | kernel-qcow2-linux-42c39a6267e9d1093b7aa1915ce187d074988d1c.tar.gz kernel-qcow2-linux-42c39a6267e9d1093b7aa1915ce187d074988d1c.tar.xz kernel-qcow2-linux-42c39a6267e9d1093b7aa1915ce187d074988d1c.zip | |
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
| -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, 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) { |