diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 08:58:23 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-13 08:58:23 -0500 |
| commit | 3e8e2cc45c9d6b5c1265838a8cff701815321dbc (patch) | |
| tree | 708e85b74bac0427389d6f41e04522dfced1773c /sound/soc/soc-cache.c | |
| parent | a193436c5d52e8398af22462beaa03407fa89b2e (diff) | |
| parent | 7bd1fd8a96098b84664acdca5361defaf1e6ce9f (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index b2e333f5a388..1a36b36c5baa 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) | |||
| 1339 | goto err; | 1339 | goto err; |
| 1340 | } | 1340 | } |
| 1341 | lzo_blocks[i]->sync_bmp = sync_bmp; | 1341 | lzo_blocks[i]->sync_bmp = sync_bmp; |
| 1342 | lzo_blocks[i]->sync_bmp_nbits = reg_size; | 1342 | lzo_blocks[i]->sync_bmp_nbits = bmp_size; |
| 1343 | /* alloc the working space for the compressed block */ | 1343 | /* alloc the working space for the compressed block */ |
| 1344 | ret = snd_soc_lzo_prepare(lzo_blocks[i]); | 1344 | ret = snd_soc_lzo_prepare(lzo_blocks[i]); |
| 1345 | if (ret < 0) | 1345 | if (ret < 0) |