diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-01-18 19:14:36 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-18 19:14:36 +0000 |
| commit | f557d39a3cb8ea892dada232c51479ae3628cdee (patch) | |
| tree | 028e1cb24c8e62663b78689ce7c91b2fdb86551c /sound/soc/intel/atom/sst-mfld-platform-pcm.c | |
| parent | ASoC: fsl_sai: Remove expensive print in irq handler (diff) | |
| parent | ASoC: amd: Fix potential NULL pointer dereference (diff) | |
| download | linux-dev-f557d39a3cb8ea892dada232c51479ae3628cdee.tar.xz linux-dev-f557d39a3cb8ea892dada232c51479ae3628cdee.zip | |
Merge tag 'asoc-fix-v5.0-rc2' into asoc-5.1
ASoC: Fixes for v5.0
Quite a big batch of fixes here. There's a couple of things going on,
the main one is that we found some issues with not deferring probe when
we should, causing us to skip some driver initialization. The fixes for
this then in turn exposed some issues with how we were searching for
components which had previously gone unnoticed due to the original
issue.
There's also been the normal driver specific stuff and there's been what
looks like several batches of automated scanning for issues which have
generated quite a large set of smaller fixes for potential crashes and
missed error handling.
Diffstat (limited to 'sound/soc/intel/atom/sst-mfld-platform-pcm.c')
| -rw-r--r-- | sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index aefa5ce4cb59..b0873fea23ab 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -399,7 +399,13 @@ static int sst_media_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params)); + int ret; + + ret = + snd_pcm_lib_malloc_pages(substream, + params_buffer_bytes(params)); + if (ret) + return ret; memset(substream->runtime->dma_area, 0, params_buffer_bytes(params)); return 0; } |