From 3b4e70fecdd64c1dbd31adec268e656f4646abfc Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 26 Nov 2009 12:50:01 +0100 Subject: [PATCH] --- yaml --- r: 170086 b: refs/heads/master c: 66b6cfacfc5aa2fda37b0d40cd54931ca5ef8cd7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/core/pcm_native.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 03f0e8b1928d..a09b6b870e7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9eb4a06788a598573c751af1a7e46639afc89513 +refs/heads/master: 66b6cfacfc5aa2fda37b0d40cd54931ca5ef8cd7 diff --git a/trunk/sound/core/pcm_native.c b/trunk/sound/core/pcm_native.c index c906be26c312..e48c5f618578 100644 --- a/trunk/sound/core/pcm_native.c +++ b/trunk/sound/core/pcm_native.c @@ -3066,6 +3066,10 @@ static inline struct page * snd_pcm_default_page_ops(struct snd_pcm_substream *substream, unsigned long ofs) { void *vaddr = substream->runtime->dma_area + ofs; +#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT) + if (substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) + return virt_to_page(CAC_ADDR(vaddr)); +#endif return virt_to_page(vaddr); }