lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Trivial overlap with the removal of the local revision variable.

Conflicts:
	sound/soc/codecs/wm8994.c
This commit is contained in:
Mark Brown
2010-08-15 14:56:40 +01:00
parent 6bfb6aa91f a532f97c71
commit ec62dbd7eb
9 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/soc-cache.c
View File

@@ -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;