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

Merge branch 'for-2.6.39' into for-2.6.40

Browse Source
This commit is contained in:
Mark Brown
2011-04-03 22:12:15 +09:00
parent 04368d051a 00b317a41c
commit f6fcdc1456
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/soc-core.c
View File

@@ -92,8 +92,8 @@ static int min_bytes_needed(unsigned long val)
static int format_register_str(struct snd_soc_codec *codec, static int format_register_str(struct snd_soc_codec *codec,
unsigned int reg, char *buf, size_t len) unsigned int reg, char *buf, size_t len)
{ {
int wordsize = codec->driver->reg_word_size * 2; int wordsize = min_bytes_needed(codec->driver->reg_cache_size) * 2;
int regsize = min_bytes_needed(codec->driver->reg_cache_size) * 2; int regsize = codec->driver->reg_word_size * 2;
int ret; int ret;
char tmpbuf[len + 1]; char tmpbuf[len + 1];
char regbuf[regsize + 1]; char regbuf[regsize + 1];
@@ -132,8 +132,8 @@ static ssize_t soc_codec_reg_show(struct snd_soc_codec *codec, char *buf,
size_t total = 0; size_t total = 0;
loff_t p = 0; loff_t p = 0;
wordsize = codec->driver->reg_word_size * 2; wordsize = min_bytes_needed(codec->driver->reg_cache_size) * 2;
regsize = min_bytes_needed(codec->driver->reg_cache_size) * 2; regsize = codec->driver->reg_word_size * 2;
len = wordsize + regsize + 2 + 1; len = wordsize + regsize + 2 + 1;