diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2020-07-07 13:12:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-07-07 13:13:12 +0200 |
| commit | 467fd0e82b6265b8e6cc078a70bd7592574d5c83 (patch) | |
| tree | 46ed27fc4a94ce40441df886bdc0a1780942be57 /sound/core | |
| parent | ALSA: hda/hdmi: Add Intel silent stream support (diff) | |
| download | linux-dev-467fd0e82b6265b8e6cc078a70bd7592574d5c83.tar.xz linux-dev-467fd0e82b6265b8e6cc078a70bd7592574d5c83.zip | |
ALSA: pcm: Fix build error on m68k and others
The commit 3ad796cbc36a ("ALSA: pcm: Use SG-buffer only when direct
DMA is available") introduced a check of the DMA type and this caused
a build error on m68k (and possibly some others) due to the lack of
dma_is_direct() definition. Since the check is needed only for
CONFIG_SND_DMA_SGBUF enablement (i.e. solely x86), use #ifdef instead
of IS_ENABLED() for avoiding such a build error.
Fixes: 3ad796cbc36a ("ALSA: pcm: Use SG-buffer only when direct DMA is available")
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/20200707111225.26826-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_memory.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c index 8326d16d3596..795af1b88051 100644 --- a/sound/core/pcm_memory.c +++ b/sound/core/pcm_memory.c @@ -41,8 +41,9 @@ static int do_alloc_pages(struct snd_card *card, int type, struct device *dev, card->total_pcm_alloc_bytes + size > max_alloc_per_card) return -ENOMEM; - if (IS_ENABLED(CONFIG_SND_DMA_SGBUF) && - (type == SNDRV_DMA_TYPE_DEV_SG || type == SNDRV_DMA_TYPE_DEV_UC_SG) && + +#ifdef CONFIG_SND_DMA_SGBUF + if ((type == SNDRV_DMA_TYPE_DEV_SG || type == SNDRV_DMA_TYPE_DEV_UC_SG) && !dma_is_direct(get_dma_ops(dev))) { /* mutate to continuous page allocation */ dev_dbg(dev, "Use continuous page allocator\n"); @@ -51,6 +52,7 @@ static int do_alloc_pages(struct snd_card *card, int type, struct device *dev, else type = SNDRV_DMA_TYPE_DEV_UC; } +#endif /* CONFIG_SND_DMA_SGBUF */ err = snd_dma_alloc_pages(type, dev, size, dmab); if (!err) { |