summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Girdwood2014-05-02 17:56:29 +0200
committerMark Brown2014-05-02 18:53:01 +0200
commit84fbdd58614e35108ece5c79ada33443dbcdaf37 (patch)
tree02e481814bc2a2aeec40d120fbbdaf75ec3daf45
parentASoC: Intel: Fix block allocation so we only allocate blocks once. (diff)
downloadkernel-qcow2-linux-84fbdd58614e35108ece5c79ada33443dbcdaf37.tar.gz
kernel-qcow2-linux-84fbdd58614e35108ece5c79ada33443dbcdaf37.tar.xz
kernel-qcow2-linux-84fbdd58614e35108ece5c79ada33443dbcdaf37.zip
ASoC: Intel: Fix allocated block list usage when adding blocks.
Make sure we add the allocated blocks to the modules list of blocks. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/intel/sst-firmware.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index c4e7126ebc06..5fed75cef64f 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -202,6 +202,9 @@ static int block_alloc_contiguous(struct sst_module *module,
size -= block->size;
}
+ list_for_each_entry(block, &tmp, list)
+ list_add(&block->module_list, &module->block_list);
+
list_splice(&tmp, &dsp->used_block_list);
return 0;
}