From 058e01facdf20ee144905ef330d98375411e24ee Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Thu, 5 Oct 2006 11:35:16 -0700 Subject: [PATCH] --- yaml --- r: 39097 b: refs/heads/master c: c1ce464d29e5bbf5819b2d7527b7d3030a6d65f1 h: refs/heads/master i: 39095: 584af51c61461f430ed1250af7f91526c82fbde3 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/prom.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 72b3dd258da1..2195d0db9331 100644 --- 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 index eb913f80bfb1..865b9648d0d5 100644 --- 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 */