diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-02-08 16:12:15 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-02-08 16:12:15 +0300 |
| commit | 36e4617c01153757cde9e5fcd375a75a8f8425c3 (patch) | |
| tree | 3c95a8e5efc6cd1616bd3eadda68cb27101688b3 /sound/sh/aica.c | |
| parent | 0b2338a9bf36b5ac6ed43425e2f1357fb3d3841b (diff) | |
| parent | 62e94da3e9d8b991a467f376441a805c5d14c9c7 (diff) | |
| download | linux-36e4617c01153757cde9e5fcd375a75a8f8425c3.tar.xz | |
Merge branch 'topic/memory-device-fixes-2' into for-next
Pull further device memory allocation cleanups (but no API change yet).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/sh/aica.c')
| -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 */ |