Commit f623f388 authored by David S. Miller's avatar David S. Miller

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent 8163904e
......@@ -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) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment