summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Girdwood <liam.r.girdwood@linux.intel.com>2014-05-02 17:56:27 +0200
committerMark Brown <broonie@linaro.org>2014-05-02 18:51:58 +0200
commit48695f3d4e7abbfb8fbba45397dce4d5fc0ccfed (patch)
tree8ce80f3ccf4e011fd9611ada4a356382cb94c144
parentASoC: Intel: Cancel hsw_notification_work before freeing the stream (diff)
downloadlinux-48695f3d4e7abbfb8fbba45397dce4d5fc0ccfed.tar.xz
linux-48695f3d4e7abbfb8fbba45397dce4d5fc0ccfed.zip
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>
-rw-r--r--sound/soc/intel/sst-firmware.c4
1 files changed, 0 insertions, 4 deletions
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;
}