Commit abe594c2 authored Jul 09, 2017 by Geert Uytterhoeven Committed by Takashi Iwai Jul 10, 2017

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>

parent 20e2b791

sound/core/pcm_native.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,

Admin message