summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-08-14 13:26:43 -0600
committerTom Rini <trini@konsulko.com>2015-08-28 12:33:14 -0400
commit972ea5339006e12a6c5d79f8c263ff5d1f463b30 (patch)
tree83e4d039c9f342ad0beab26e74def46a6d9295ce /common
parent90c36d8ab91f07679145f7fe79d7a20d4b016b31 (diff)
downloadblackbird-obmc-uboot-972ea5339006e12a6c5d79f8c263ff5d1f463b30.tar.gz
blackbird-obmc-uboot-972ea5339006e12a6c5d79f8c263ff5d1f463b30.zip
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>
Diffstat (limited to 'common')
-rw-r--r--common/malloc_simple.c2
1 files changed, 1 insertions, 1 deletions
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;
OpenPOWER on IntegriCloud