From: David S. Miller <davem@sunset.davemloft.net>
Date: Sun, 29 Jul 2007 09:10:37 +0000 (-0700)
Subject: [SPARC]: Fix serial console node string creation.
X-Git-Tag: v2.6.23-rc2~155^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f623f388e4f83c01ac23f228247a6a4b9cc71111;p=linux-2.6-omap-h63xx.git

[SPARC]: Fix serial console node string creation.

The string setting code depends upon the original value of the
"skip" variable, not the one that gets modified by the node
traversal loop.

Based upon a patch by Mark Fortescue.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c
index e3a537650db..39fbd3c8ab0 100644
--- a/arch/sparc/kernel/prom.c
+++ b/arch/sparc/kernel/prom.c
@@ -415,7 +415,7 @@ static void __init of_console_init(void)
 	unsigned long flags;
 	const char *type;
 	phandle node;
-	int skip, fd;
+	int skip, tmp, fd;
 
 	of_console_path = prom_early_alloc(256);
 
@@ -442,8 +442,9 @@ static void __init of_console_init(void)
 			prom_halt();
 		}
 
+		tmp = skip;
 		for_each_node_by_type(dp, type) {
-			if (!skip--)
+			if (!tmp--)
 				break;
 		}
 		if (!dp) {