From 37e54351227cabe2d787f06a2e1ea9225b6444d4 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sun, 3 Apr 2011 22:12:15 +0900 Subject: [PATCH] --- yaml --- r: 248248 b: refs/heads/master c: f6fcdc145679f5c86ff3fe587b060c9c3709d360 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-core.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4cc5db570a4e..09b25b1089d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04368d051a6aa90c14a3ca5a48f60aca2f6ecdd1 +refs/heads/master: f6fcdc145679f5c86ff3fe587b060c9c3709d360 diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 5ae70a107f1f..0cf699762ff7 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/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;