diff options
author | Kevin Hickey <khickey@rmicorp.com> | 2008-07-28 14:09:26 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-30 16:54:34 -0400 |
commit | fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc (patch) | |
tree | 3c94f7de26bdcb0ddd73edf42a0bdb893fbe125c /arch/mips/au1000/pb1200/init.c | |
parent | af6dc22b03a95c31b690f299b2fd7acb279fe7f5 (diff) |
[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/pb1200/init.c')
-rw-r--r-- | arch/mips/au1000/pb1200/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c index 09fd63b8606..e9b2a0fd48a 100644 --- a/arch/mips/au1000/pb1200/init.c +++ b/arch/mips/au1000/pb1200/init.c | |||
@@ -53,6 +53,6 @@ void __init prom_init(void) | |||
53 | if (!memsize_str) | 53 | if (!memsize_str) |
54 | memsize = 0x08000000; | 54 | memsize = 0x08000000; |
55 | else | 55 | else |
56 | memsize = strict_strtol(memsize_str, 0, NULL); | 56 | strict_strtol(memsize_str, 0, &memsize); |
57 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 57 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
58 | } | 58 | } |