summaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000/xxs1500
diff options
context:
space:
mode:
authorKevin Hickey <khickey@rmicorp.com>2008-07-28 13:09:26 -0500
committerRalf Baechle <ralf@linux-mips.org>2008-07-30 21:54:34 +0100
commitfd7ccfa7ac64156a5c1c906e0986b73d481b6dfc (patch)
tree3c94f7de26bdcb0ddd73edf42a0bdb893fbe125c /arch/mips/au1000/xxs1500
parentaf6dc22b03a95c31b690f299b2fd7acb279fe7f5 (diff)
downloadlinux-stable-fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc.tar.gz
linux-stable-fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc.tar.bz2
linux-stable-fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc.zip
[MIPS] Initialization of Alchemy boards
An earlier update changed some calls from simple_strotl to strict_strtol but did not account for the differences in the syntax between the calls. simple_strotl returns the integer; strict_strtol returns an error code and takes a pointer to the result. As it was, NULL was being passed in place of the result, which led to failures during kernel initialization when using YAMON. Signed-off-by: Kevin Hickey <khickey@rmicorp.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000/xxs1500')
-rw-r--r--arch/mips/au1000/xxs1500/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c
index b849bf501c04..7516434760a1 100644
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -53,6 +53,6 @@ void __init prom_init(void)
if (!memsize_str)
memsize = 0x04000000;
else
- memsize = strict_strtol(memsize_str, 0, NULL);
+ strict_strtol(memsize_str, 0, &memsize);
add_memory_region(0, memsize, BOOT_MEM_RAM);
}