diff --git a/[refs] b/[refs]
index 03f54109beb7..ff761d1b31a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cae367e4854ff055c4f5e8aacd56b0eeec9f6cb
+refs/heads/master: 399154be2dcb6a58dbde9682162c38113cf3e40b
diff --git a/trunk/mm/dmapool.c b/trunk/mm/dmapool.c
index b5ff9ce8765b..744d541df866 100644
--- a/trunk/mm/dmapool.c
+++ b/trunk/mm/dmapool.c
@@ -106,17 +106,18 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
 {
 	struct dma_pool *retval;
 
-	if (align == 0)
+	if (align == 0) {
 		align = 1;
-	if (size == 0)
+	} else if (align & (align - 1)) {
 		return NULL;
-	else if (size < align)
-		size = align;
-	else if ((size % align) != 0) {
-		size += align + 1;
-		size &= ~(align - 1);
 	}
 
+	if (size == 0)
+		return NULL;
+
+	if ((size % align) != 0)
+		size = ALIGN(size, align);
+
 	if (allocation == 0) {
 		if (PAGE_SIZE < size)
 			allocation = size;