X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=sound%2Fcore%2Fmemalloc.c;h=966bef5acc750650a9e7b30f878601158e8733c7;hb=8acb54abc1db4e1e3913359e4108e04e88ce4d92;hp=0aeeb6244ff6c513259567be9ee7214f97d2e4a4;hpb=334a1683935fceba346768b62cb3bb2d3e045578;p=linux-2.6-microblaze.git

diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 0aeeb6244ff6..966bef5acc75 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -77,7 +77,8 @@ static void snd_malloc_dev_iram(struct snd_dma_buffer *dmab, size_t size)
 	/* Assign the pool into private_data field */
 	dmab->private_data = pool;
 
-	dmab->area = gen_pool_dma_alloc(pool, size, &dmab->addr);
+	dmab->area = gen_pool_dma_alloc_align(pool, size, &dmab->addr,
+					PAGE_SIZE);
 }
 
 /**
@@ -132,6 +133,7 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
 	if (WARN_ON(!dmab))
 		return -ENXIO;
 
+	size = PAGE_ALIGN(size);
 	dmab->dev.type = type;
 	dmab->dev.dev = device;
 	dmab->bytes = 0;