summaryrefslogtreecommitdiffstats
path: root/sound/soc/stm
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-03-18 11:15:09 +0000
committerMark Brown <broonie@kernel.org>2019-03-18 11:15:09 +0000
commit127470597b6b9466872d9794a80804ec95fff8ea (patch)
treeb0087938a7f980c5b3d3879e0c2d18bab45d78e8 /sound/soc/stm
parent3789debfc379ac84b90e2db32d7a6b66d28a2c7c (diff)
parent9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff)
downloadlinux-127470597b6b9466872d9794a80804ec95fff8ea.tar.bz2
Merge tag 'v5.1-rc1' into asoc-5.2
Linux 5.1-rc1
Diffstat (limited to 'sound/soc/stm')
-rw-r--r--sound/soc/stm/stm32_adfsdm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c
index 706ff005234f..47901983a6ff 100644
--- a/sound/soc/stm/stm32_adfsdm.c
+++ b/sound/soc/stm/stm32_adfsdm.c
@@ -262,8 +262,9 @@ static int stm32_adfsdm_pcm_new(struct snd_soc_pcm_runtime *rtd)
snd_soc_dai_get_drvdata(rtd->cpu_dai);
unsigned int size = DFSDM_MAX_PERIODS * DFSDM_MAX_PERIOD_SIZE;
- return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
- priv->dev, size, size);
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+ priv->dev, size, size);
+ return 0;
}
static void stm32_adfsdm_pcm_free(struct snd_pcm *pcm)