summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-cache.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-13 13:58:23 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-13 13:58:23 +0000
commit3e8e2cc45c9d6b5c1265838a8cff701815321dbc (patch)
tree708e85b74bac0427389d6f41e04522dfced1773c /sound/soc/soc-cache.c
parenta193436c5d52e8398af22462beaa03407fa89b2e (diff)
parent7bd1fd8a96098b84664acdca5361defaf1e6ce9f (diff)
downloadop-kernel-dev-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.zip
op-kernel-dev-3e8e2cc45c9d6b5c1265838a8cff701815321dbc.tar.gz
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'sound/soc/soc-cache.c')
-rw-r--r--sound/soc/soc-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index b2e333f..1a36b36 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -1339,7 +1339,7 @@ static int snd_soc_lzo_cache_init(struct snd_soc_codec *codec)
goto err;
}
lzo_blocks[i]->sync_bmp = sync_bmp;
- lzo_blocks[i]->sync_bmp_nbits = reg_size;
+ lzo_blocks[i]->sync_bmp_nbits = bmp_size;
/* alloc the working space for the compressed block */
ret = snd_soc_lzo_prepare(lzo_blocks[i]);
if (ret < 0)
OpenPOWER on IntegriCloud