summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorCliff Cai <cliff.cai@analog.com>2010-08-07 11:16:27 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-10 15:42:32 +0100
commitac770267a7cd85a747b6111db46f66d1515e7cd7 (patch)
treed2934c8c2f69f47472e6b505bc078c4c37e57e0c /sound
parent4f0ed9a51bc8ef16c2589112fdb110479e4b0df1 (diff)
downloadlinux-3.10-ac770267a7cd85a747b6111db46f66d1515e7cd7.tar.gz
linux-3.10-ac770267a7cd85a747b6111db46f66d1515e7cd7.tar.bz2
linux-3.10-ac770267a7cd85a747b6111db46f66d1515e7cd7.zip
ASoC: register cache should be 1 byte aligned for 1 byte long register
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> Cc: stable@kernel.org
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 472af38188c..adbc68ce905 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;