summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2017-07-09 21:31:02 +0200
committerTakashi Iwai <tiwai@suse.de>2017-07-10 16:04:08 +0200
commitabe594c2cf55b46d4feb61c01fe9063afff2e50c (patch)
treef59bd67757fa4cf6f9099cd340609fc8768ca5f0 /sound
parent20e2b791796bd68816fa115f12be5320de2b8021 (diff)
downloadlinux-abe594c2cf55b46d4feb61c01fe9063afff2e50c.tar.gz
linux-abe594c2cf55b46d4feb61c01fe9063afff2e50c.tar.bz2
linux-abe594c2cf55b46d4feb61c01fe9063afff2e50c.zip
ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA
If NO_DMA=y: sound/core/pcm_native.o: In function `snd_pcm_lib_default_mmap': pcm_native.c:(.text+0x144c): undefined reference to `bad_dma_ops' pcm_native.c:(.text+0x1474): undefined reference to `dma_common_mmap' Add a check for HAS_DMA to fix this. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/pcm_native.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 0d1834310531..b26c7e61d600 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3502,7 +3502,7 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,
}
#endif /* CONFIG_GENERIC_ALLOCATOR */
#ifndef CONFIG_X86 /* for avoiding warnings arch/x86/mm/pat.c */
- if (!substream->ops->page &&
+ if (IS_ENABLED(CONFIG_HAS_DMA) && !substream->ops->page &&
substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV)
return dma_mmap_coherent(substream->dma_buffer.dev.dev,
area,