diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 15:56:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 15:56:40 +0200 |
| commit | ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1 (patch) | |
| tree | c7fcfd4ad7ad1875e611db3a2bd75d64f603c355 /sound/soc/soc-cache.c | |
| parent | ASoC: Automatically manage WM8580 DAC OSR (diff) | |
| parent | MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices (diff) | |
| download | linux-ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1.tar.xz linux-ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1.zip | |
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37
Trivial overlap with the removal of the local revision variable.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'sound/soc/soc-cache.c')
| -rw-r--r-- | sound/soc/soc-cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index b856177ea281..12281111f100 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -340,7 +340,7 @@ static unsigned int snd_soc_16_8_read_i2c(struct snd_soc_codec *codec, static unsigned int snd_soc_16_8_read(struct snd_soc_codec *codec, unsigned int reg) { - u16 *cache = codec->reg_cache; + u8 *cache = codec->reg_cache; reg &= 0xff; if (reg >= codec->driver->reg_cache_size) @@ -351,7 +351,7 @@ static unsigned int snd_soc_16_8_read(struct snd_soc_codec *codec, static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value) { - u16 *cache = codec->reg_cache; + u8 *cache = codec->reg_cache; u8 data[3]; int ret; |