diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-30 18:17:13 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-30 18:17:13 +0300 |
| commit | e83ce4a51757cf63970a76090662f636112231a7 (patch) | |
| tree | e1edaf29646eff64a3e94b2be77f7073ed8abb0d /sound/soc/intel/sst-firmware.c | |
| parent | d6795827bd79b28fef1abdaf7e525fcca506b831 (diff) | |
| parent | f2ec1d3b25776051a9205289dab12e9401d33f8a (diff) | |
| download | linux-e83ce4a51757cf63970a76090662f636112231a7.tar.xz | |
Merge tag 'asoc-fix-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.19
A few fixes for v3.19, a few driver specifics and one core fix which
fixes a boot crash on OMAP if deferred probing kicks in due to
attempting to modify static data.
Diffstat (limited to 'sound/soc/intel/sst-firmware.c')
| -rw-r--r-- | sound/soc/intel/sst-firmware.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c index 4a5bde9c686b..ef2e8b5766a1 100644 --- a/sound/soc/intel/sst-firmware.c +++ b/sound/soc/intel/sst-firmware.c @@ -763,8 +763,12 @@ static int block_alloc_fixed(struct sst_dsp *dsp, struct sst_block_allocator *ba /* does block span more than 1 section */ if (ba->offset >= block->offset && ba->offset < block_end) { + /* add block */ + list_move(&block->list, &dsp->used_block_list); + list_add(&block->module_list, block_list); /* align ba to block boundary */ - ba->offset = block->offset; + ba->size -= block_end - ba->offset; + ba->offset = block_end; err = block_alloc_contiguous(dsp, ba, block_list); if (err < 0) |