diff options
author | 2009-09-10 15:32:50 +0200 | |
---|---|---|
committer | 2009-09-10 15:32:50 +0200 | |
commit | f9892a52e2405b4c5fa205d4f18ad292cb7e40bb (patch) | |
tree | 04a74c1f32047f1fbaa69cc34b484f91013e6f42 /sound/core/memalloc.c | |
parent | Merge branch 'topic/ctxfi' into for-linus (diff) | |
parent | ALSA: Fix SG-buffer DMA with non-coherent architectures (diff) | |
download | linux-f9892a52e2405b4c5fa205d4f18ad292cb7e40bb.tar.gz linux-f9892a52e2405b4c5fa205d4f18ad292cb7e40bb.tar.bz2 linux-f9892a52e2405b4c5fa205d4f18ad292cb7e40bb.zip |
Merge branch 'topic/dma-sgbuf' into for-linus
* topic/dma-sgbuf:
ALSA: Fix SG-buffer DMA with non-coherent architectures
Diffstat (limited to 'sound/core/memalloc.c')
-rw-r--r-- | sound/core/memalloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 1b3534d67686..9e92441f9b78 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -199,6 +199,8 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size, case SNDRV_DMA_TYPE_DEV: dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr); break; +#endif +#ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG: snd_malloc_sgbuf_pages(device, size, dmab, NULL); break; @@ -269,6 +271,8 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab) case SNDRV_DMA_TYPE_DEV: snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr); break; +#endif +#ifdef CONFIG_SND_DMA_SGBUF case SNDRV_DMA_TYPE_DEV_SG: snd_free_sgbuf_pages(dmab); break; |