]> err.no Git - linux-2.6/commitdiff
[SPARC]: Fix serial console node string creation.
authorDavid S. Miller <davem@sunset.davemloft.net>
Sun, 29 Jul 2007 09:10:37 +0000 (02:10 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 30 Jul 2007 07:27:37 +0000 (00:27 -0700)
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>
arch/sparc/kernel/prom.c

index e3a537650db1e8792c0d7a7978b0e52ab3e7fe2e..39fbd3c8ab0b7cce84534bd4eb8b8726e1e270e1 100644 (file)
@@ -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) {