Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b39aab1 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: Intel: Fix block offset calculations. 



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

Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e9024f0b

sound/soc/intel/sst-firmware.c

+3 −5
Original line number Diff line number Diff line
@@ -244,8 +244,7 @@ static int block_alloc(struct sst_module *module, 
		/* do we span > 1 blocks */

		if (data->size > block->size) {

			ret = block_alloc_contiguous(module, data,

				block->offset + block->size,

				data->size - block->size);

				block->offset, data->size);

			if (ret == 0)

				return ret;

		}
@@ -341,7 +340,7 @@ static int block_alloc_fixed(struct sst_module *module, 


			err = block_alloc_contiguous(module, data,

				block->offset + block->size,

				data->size - block->size + data->offset - block->offset);

				data->size - block->size);

			if (err < 0)

				return -ENOMEM;
@@ -368,8 +367,7 @@ static int block_alloc_fixed(struct sst_module *module, 
		if (data->offset >= block->offset && data->offset < block_end) {



			err = block_alloc_contiguous(module, data,

				block->offset + block->size,

				data->size - block->size);

				block->offset, data->size);

			if (err < 0)

				return -ENOMEM;