From: Simon Glass <sjg@chromium.org>
Date: Fri, 14 Aug 2015 19:26:43 +0000 (-0600)
Subject: malloc_simple: Correct the alignment logic in memalign_simple()
X-Git-Tag: KARO-TX6-2015-09-18~115
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=eff96e99588f9aad8325bcb5206c21b3075c7634

malloc_simple: Correct the alignment logic in memalign_simple()

This should use the align parameter, not bytes. Natural alignment is one
use case but should not be the only one supported by this function.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 9811ab60f6..134e059706 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -31,7 +31,7 @@ void *memalign_simple(size_t align, size_t bytes)
 	ulong addr, new_ptr;
 	void *ptr;
 
-	addr = ALIGN(gd->malloc_base + gd->malloc_ptr, bytes);
+	addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
 	new_ptr = addr + bytes;
 	if (new_ptr > gd->malloc_limit)
 		return NULL;