diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-18 11:14:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-18 11:14:51 +0000 |
| commit | 22d91ed32b653481f47e81719858678e8c92089e (patch) | |
| tree | a10d240e35ba7fa5d6bb1c9aad1a5db622e5dddd /sound/soc/mediatek | |
| parent | 2b13bee3884926cba22061efa75bd315e871de24 (diff) | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
| download | linux-stable-22d91ed32b653481f47e81719858678e8c92089e.tar.gz linux-stable-22d91ed32b653481f47e81719858678e8c92089e.tar.bz2 linux-stable-22d91ed32b653481f47e81719858678e8c92089e.zip | |
Merge tag 'v5.1-rc1' into asoc-5.1
Linux 5.1-rc1
Diffstat (limited to 'sound/soc/mediatek')
| -rw-r--r-- | sound/soc/mediatek/common/mtk-afe-platform-driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/mediatek/common/mtk-afe-platform-driver.c b/sound/soc/mediatek/common/mtk-afe-platform-driver.c index 697aa50aff9a..3ce527ce30ce 100644 --- a/sound/soc/mediatek/common/mtk-afe-platform-driver.c +++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.c @@ -126,9 +126,9 @@ int mtk_afe_pcm_new(struct snd_soc_pcm_runtime *rtd) struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); size = afe->mtk_afe_hardware->buffer_bytes_max; - return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, - afe->dev, - size, size); + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, + afe->dev, size, size); + return 0; } EXPORT_SYMBOL_GPL(mtk_afe_pcm_new); |