diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-18 12:14:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-18 12:14:51 +0100 |
| commit | 22d91ed32b653481f47e81719858678e8c92089e (patch) | |
| tree | a10d240e35ba7fa5d6bb1c9aad1a5db622e5dddd /sound/sh | |
| parent | ASoC: samsung: odroid: Fix clock configuration for 44100 sample rate (diff) | |
| parent | Linux 5.1-rc1 (diff) | |
| download | linux-22d91ed32b653481f47e81719858678e8c92089e.tar.xz linux-22d91ed32b653481f47e81719858678e8c92089e.zip | |
Merge tag 'v5.1-rc1' into asoc-5.1
Linux 5.1-rc1
Diffstat (limited to 'sound/sh')
| -rw-r--r-- | sound/sh/aica.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 2b26311405a4..e7fef3fce44a 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -464,14 +464,12 @@ static int __init snd_aicapcmchip(struct snd_card_aica snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_aicapcm_playback_ops); /* Allocate the DMA buffers */ - err = - snd_pcm_lib_preallocate_pages_for_all(pcm, - SNDRV_DMA_TYPE_CONTINUOUS, - snd_dma_continuous_data - (GFP_KERNEL), - AICA_BUFFER_SIZE, - AICA_BUFFER_SIZE); - return err; + snd_pcm_lib_preallocate_pages_for_all(pcm, + SNDRV_DMA_TYPE_CONTINUOUS, + snd_dma_continuous_data(GFP_KERNEL), + AICA_BUFFER_SIZE, + AICA_BUFFER_SIZE); + return 0; } /* Mixer controls */ |