summaryrefslogtreecommitdiff
path: root/sound/soc/txx9/txx9aclc.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-08 16:12:15 +0300
committerTakashi Iwai <tiwai@suse.de>2019-02-08 16:12:15 +0300
commit36e4617c01153757cde9e5fcd375a75a8f8425c3 (patch)
tree3c95a8e5efc6cd1616bd3eadda68cb27101688b3 /sound/soc/txx9/txx9aclc.c
parent0b2338a9bf36b5ac6ed43425e2f1357fb3d3841b (diff)
parent62e94da3e9d8b991a467f376441a805c5d14c9c7 (diff)
downloadlinux-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/soc/txx9/txx9aclc.c')
-rw-r--r--sound/soc/txx9/txx9aclc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index 8d31fe628e2f..089bd7518606 100644
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -313,8 +313,10 @@ static int txx9aclc_pcm_new(struct snd_soc_pcm_runtime *rtd)
if (ret)
goto exit;
}
- return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+
+ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
card->dev, 64 * 1024, 4 * 1024 * 1024);
+ return 0;
exit:
for (i = 0; i < 2; i++) {