diff --git a/[refs] b/[refs] index 1ad5d60e8cef..bfc0409db648 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85dfcdffc227717fd218b9a86b507d9b7a3c321d +refs/heads/master: f4bee1bb0083869b1b7d73c6eda7703a7aae0506 diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c index 91db7afb1210..9dfe9a58a314 100644 --- a/trunk/sound/soc/soc-cache.c +++ b/trunk/sound/soc/soc-cache.c @@ -159,7 +159,8 @@ static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg, BUG_ON(codec->volatile_register); - data[0] = reg & 0xff; + reg &= 0xff; + data[0] = reg; data[1] = value & 0xff; if (reg < codec->reg_cache_size) @@ -180,6 +181,7 @@ static unsigned int snd_soc_8_8_read(struct snd_soc_codec *codec, unsigned int reg) { u8 *cache = codec->reg_cache; + reg &= 0xff; if (reg >= codec->reg_cache_size) return -1; return cache[reg];