From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Date: Fri, 2 May 2014 15:56:27 +0000 (+0100)
Subject: ASoC: Intel: Fix block allocation so we only allocate blocks once.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=48695f3d4e7abbfb8fbba45397dce4d5fc0ccfed;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ASoC: Intel: Fix block allocation so we only allocate blocks once.

Make sure we dont alloc blocks twice with requests spanning more
than one block.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index f7687107cf7f..c4e7126ebc06 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -376,10 +376,6 @@ static int block_alloc_fixed(struct sst_module *module,
 			if (err < 0)
 				return -ENOMEM;
 
-			/* add block */
-			block->data_type = data->data_type;
-			list_move(&block->list, &dsp->used_block_list);
-			list_add(&block->module_list, &module->block_list);
 			return 0;
 		}