ALSA: Allocate larger pages in sgbuf

[linux-2.6-omap-h63xx.git] / include / sound / memalloc.h

diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index 96d0dc171459c58cb519993e3a5625d0c7b4cafb..d787a6b4a10123006f1384ffc61153ec9c9a733c 100644 (file)
--- a/include/sound/memalloc.h
+++ b/include/sound/memalloc.h
@@ -97,7 +97,9 @@ static inline unsigned int snd_sgbuf_aligned_pages(size_t size)
  */
 static inline dma_addr_t snd_sgbuf_get_addr(struct snd_sg_buf *sgbuf, size_t offset)
 {
-       return sgbuf->table[offset >> PAGE_SHIFT].addr + offset % PAGE_SIZE;
+       dma_addr_t addr = sgbuf->table[offset >> PAGE_SHIFT].addr;
+       addr &= PAGE_MASK;
+       return addr + offset % PAGE_SIZE;
 }
 
 /*