diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-29 02:10:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-30 00:27:37 -0700 |
| commit | f623f388e4f83c01ac23f228247a6a4b9cc71111 (patch) | |
| tree | 4ee8e54a33e88d0197442f60f36b85dc5d842ad1 /arch/sparc | |
| parent | 8163904e660a30be800a3361df69bf9dad3b44cd (diff) | |
| download | op-kernel-dev-f623f388e4f83c01ac23f228247a6a4b9cc71111.zip op-kernel-dev-f623f388e4f83c01ac23f228247a6a4b9cc71111.tar.gz | |
[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>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/prom.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c index e3a5376..39fbd3c 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) { |
