diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-11 15:53:41 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-11 15:53:41 +0300 |
| commit | 357635ae0133ae66c4eac5b9ad4879b15faa5be8 (patch) | |
| tree | ff0c87bc2f627308eef88db932f6fedf48c3146d /sound/soc/intel/sst-haswell-dsp.c | |
| parent | 11dd60447e3b1018f9cae66737cb902b519d3454 (diff) | |
| parent | 3fe0607a04ed7deea7c048052fd63b8670e7a176 (diff) | |
| download | linux-357635ae0133ae66c4eac5b9ad4879b15faa5be8.tar.xz | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/sst-haswell-dsp.c')
| -rw-r--r-- | sound/soc/intel/sst-haswell-dsp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/intel/sst-haswell-dsp.c b/sound/soc/intel/sst-haswell-dsp.c index c42ffae5fe9f..402b728c0a06 100644 --- a/sound/soc/intel/sst-haswell-dsp.c +++ b/sound/soc/intel/sst-haswell-dsp.c @@ -207,9 +207,6 @@ static int hsw_parse_fw_image(struct sst_fw *sst_fw) module = (void *)module + sizeof(*module) + module->mod_size; } - /* allocate scratch mem regions */ - sst_block_alloc_scratch(dsp); - return 0; } |