summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKangjie Lu <kjlu@umn.edu>2018-12-25 20:29:48 -0600
committerMark Brown <broonie@kernel.org>2019-01-07 18:10:03 +0000
commit44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661 (patch)
treeab8a92f2eae984fef31ba26a88612ddcd1f9bd24 /sound/soc
parent667e9334fa64da2273e36ce131b05ac9e47c5769 (diff)
downloadlinux-stable-44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661.tar.gz
linux-stable-44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661.tar.bz2
linux-stable-44fabd8cdaaa3acb80ad2bb3b5c61ae2136af661.zip
ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages
snd_pcm_lib_malloc_pages() may fail, so let's check its status and return its error code upstream. Signed-off-by: Kangjie Lu <kjlu@umn.edu> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/intel/atom/sst-mfld-platform-pcm.c8
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 afc559866095..91a2436ce952 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;
}