diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-02-08 08:12:15 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-02-08 08:12:15 -0500 |
commit | 36e4617c01153757cde9e5fcd375a75a8f8425c3 (patch) | |
tree | 3c95a8e5efc6cd1616bd3eadda68cb27101688b3 /sound/soc/mediatek | |
parent | 0b2338a9bf36b5ac6ed43425e2f1357fb3d3841b (diff) | |
parent | 62e94da3e9d8b991a467f376441a805c5d14c9c7 (diff) |
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/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) | |||
126 | struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); | 126 | struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component); |
127 | 127 | ||
128 | size = afe->mtk_afe_hardware->buffer_bytes_max; | 128 | size = afe->mtk_afe_hardware->buffer_bytes_max; |
129 | return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, | 129 | snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, |
130 | afe->dev, | 130 | afe->dev, size, size); |
131 | size, size); | 131 | return 0; |
132 | } | 132 | } |
133 | EXPORT_SYMBOL_GPL(mtk_afe_pcm_new); | 133 | EXPORT_SYMBOL_GPL(mtk_afe_pcm_new); |
134 | 134 | ||