diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 17:12:15 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 17:12:15 +0400 |
| commit | f6fcdc145679f5c86ff3fe587b060c9c3709d360 (patch) | |
| tree | bcc2d99831afd6b371748a60dc17ce550c33dd4b /sound/soc | |
| parent | 04368d051a6aa90c14a3ca5a48f60aca2f6ecdd1 (diff) | |
| parent | 00b317a41c5428b13eb7e5b4bbc691b1aa7afa80 (diff) | |
| download | linux-f6fcdc145679f5c86ff3fe587b060c9c3709d360.tar.xz | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 5ae70a107f1f..0cf699762ff7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -92,8 +92,8 @@ static int min_bytes_needed(unsigned long val) static int format_register_str(struct snd_soc_codec *codec, unsigned int reg, char *buf, size_t len) { - int wordsize = codec->driver->reg_word_size * 2; - int regsize = min_bytes_needed(codec->driver->reg_cache_size) * 2; + int wordsize = min_bytes_needed(codec->driver->reg_cache_size) * 2; + int regsize = codec->driver->reg_word_size * 2; int ret; char tmpbuf[len + 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; loff_t p = 0; - wordsize = codec->driver->reg_word_size * 2; - regsize = min_bytes_needed(codec->driver->reg_cache_size) * 2; + wordsize = min_bytes_needed(codec->driver->reg_cache_size) * 2; + regsize = codec->driver->reg_word_size * 2; len = wordsize + regsize + 2 + 1; |