summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorCliff Cai <cliff.cai@analog.com>2010-08-07 11:16:27 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-26 16:45:44 -0700
commita4e5c5d32bedabd04a246892d5f4422322591191 (patch)
tree41fb8d25391a08a2d2d318e8eec57b8ca110a940 /sound
parentf62010c99c29bf3ebe9f2d643d055445222cb03c (diff)
ASoC: register cache should be 1 byte aligned for 1 byte long register
commit ac770267a7cd85a747b6111db46f66d1515e7cd7 upstream. Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 472af38188c1..adbc68ce9050 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->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;