Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: Intel: Fix block offset calculations.

Browse source 
Block offset calculations are done in the contiguous allocator so
are not required here.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Liam Girdwood 2014-05-02 16:56:28 +01:00 committed by Mark Brown
parent e9024f0ba3
commit 2b39aab18a
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/intel/sst-firmware.c
View file

@ -244,8 +244,7 @@ static int block_alloc(struct sst_module *module,
/* do we span > 1 blocks */ /* do we span > 1 blocks */
if (data->size > block->size) { if (data->size > block->size) {
ret = block_alloc_contiguous(module, data, ret = block_alloc_contiguous(module, data,
block->offset + block->size, block->offset, data->size);
data->size - block->size);
if (ret == 0) if (ret == 0)
return ret; return ret;
} }
@ -341,7 +340,7 @@ static int block_alloc_fixed(struct sst_module *module,
err = block_alloc_contiguous(module, data, err = block_alloc_contiguous(module, data,
block->offset + block->size, block->offset + block->size,
data->size - block->size + data->offset - block->offset); data->size - block->size);
if (err < 0) if (err < 0)
return -ENOMEM; return -ENOMEM;
@ -368,8 +367,7 @@ static int block_alloc_fixed(struct sst_module *module,
if (data->offset >= block->offset && data->offset < block_end) { if (data->offset >= block->offset && data->offset < block_end) {
err = block_alloc_contiguous(module, data, err = block_alloc_contiguous(module, data,
block->offset + block->size, block->offset, data->size);
data->size - block->size);
if (err < 0) if (err < 0)
return -ENOMEM; return -ENOMEM;