X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fsound%2Fmemalloc.h;h=d787a6b4a10123006f1384ffc61153ec9c9a733c;hb=51e9f2e665bf2b6a01be275d64c336d942c59a66;hp=96d0dc171459c58cb519993e3a5625d0c7b4cafb;hpb=4e184f8fc06411f35fdcf4b9bc6187c857bf7214;p=linux-2.6-omap-h63xx.git

diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index 96d0dc17145..d787a6b4a10 100644
--- 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;
 }
 
 /*