Browse Source

[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>
David S. Miller 18 years ago
parent
commit
f623f388e4
1 changed files with 3 additions and 2 deletions
  1. 3 2
      arch/sparc/kernel/prom.c

+ 3 - 2
arch/sparc/kernel/prom.c

@@ -415,7 +415,7 @@ static void __init of_console_init(void)
 	unsigned long flags;
 	unsigned long flags;
 	const char *type;
 	const char *type;
 	phandle node;
 	phandle node;
-	int skip, fd;
+	int skip, tmp, fd;
 
 
 	of_console_path = prom_early_alloc(256);
 	of_console_path = prom_early_alloc(256);
 
 
@@ -442,8 +442,9 @@ static void __init of_console_init(void)
 			prom_halt();
 			prom_halt();
 		}
 		}
 
 
+		tmp = skip;
 		for_each_node_by_type(dp, type) {
 		for_each_node_by_type(dp, type) {
-			if (!skip--)
+			if (!tmp--)
 				break;
 				break;
 		}
 		}
 		if (!dp) {
 		if (!dp) {