From 475139057d96fd8c5447d22527be1551f9ed398b Mon Sep 17 00:00:00 2001 From: Zhang Ning <832666+zhangn1985@users.noreply.github.com> Date: Fri, 9 Aug 2019 11:28:03 +0800 Subject: [PATCH 16/16] ASOC: meson fix build error under 5.3.y Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com> --- sound/soc/meson-gx/aiu-i2s.c | 3 ++- sound/soc/meson-gx/aiu-spdif.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/meson-gx/aiu-i2s.c b/sound/soc/meson-gx/aiu-i2s.c index 450f1d20a1d6..21e335498112 100644 --- a/sound/soc/meson-gx/aiu-i2s.c +++ b/sound/soc/meson-gx/aiu-i2s.c @@ -313,9 +313,10 @@ static int meson_aiu_i2s_dma_new(struct snd_soc_pcm_runtime *rtd) struct snd_card *card = rtd->card->snd_card; size_t size = meson_aiu_i2s_dma_hw.buffer_bytes_max; - return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, + snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV, card->dev, size, size); + return 0; } #define AIU_CLK_CTRL_I2S_DIV_EN BIT(0) diff --git a/sound/soc/meson-gx/aiu-spdif.c b/sound/soc/meson-gx/aiu-spdif.c index 17cfe134e8f7..a54544d8f065 100644 --- a/sound/soc/meson-gx/aiu-spdif.c +++ b/sound/soc/meson-gx/aiu-spdif.c @@ -332,9 +332,10 @@ static int meson_aiu_spdif_dma_new(struct snd_soc_pcm_runtime *rtd) struct snd_card *card = rtd->card->snd_card; size_t size = meson_aiu_spdif_dma_hw.buffer_bytes_max; - return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, + snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV, card->dev, size, size); + return 0; } #define AIU_CLK_CTRL_958_DIV_EN BIT(1) -- 2.20.1