---

yaml --- r: 39097 b: refs/heads/master c: c1ce464 h: refs/heads/master i: 39095: 584af51 v: v3
git-mirror · Oct 6, 2006 · 058e01f · 058e01f
1 parent 91bdaf8
commit 058e01f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52aed7cd52ce8a1d576e26976c3950512e1af8b6
+refs/heads/master: c1ce464d29e5bbf5819b2d7527b7d3030a6d65f1
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
@@ -724,7 +724,7 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
 		strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE));
 
 #ifdef CONFIG_CMDLINE
-	if (l == 0 || (l == 1 && (*p) == 0))
+	if (p == NULL || l == 0 || (l == 1 && (*p) == 0))
 		strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
 #endif /* CONFIG_CMDLINE */