---

yaml --- r: 223333 b: refs/heads/master c: 690ca2c h: refs/heads/master i: 223331: 414b4ac v: v3
git-mirror · Dec 16, 2010 · c5ac105 · c5ac105
1 parent f0072b9
commit c5ac105
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec79812580e360081b58c3e2e8b5b69b8080b5a0
+refs/heads/master: 690ca2ce0c824e8d3da7b2e273c2c873ab96d1e6
diff --git a/trunk/arch/mips/alchemy/devboards/prom.c b/trunk/arch/mips/alchemy/devboards/prom.c
@@ -54,10 +54,9 @@ void __init prom_init(void)
 
 	prom_init_cmdline();
 	memsize_str = prom_getenv("memsize");
-	if (!memsize_str)
+	if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize))
 		memsize = ALCHEMY_BOARD_DEFAULT_MEMSIZE;
-	else
-		strict_strtoul(memsize_str, 0, &memsize);
+
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }