]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
post: fix indendation/brace confusion
authorJames Kosin <jkosin@intcomgrp.com>
Thu, 14 Jul 2011 08:15:06 +0000 (08:15 +0000)
committerWolfgang Denk <wd@denx.de>
Tue, 26 Jul 2011 14:57:49 +0000 (16:57 +0200)
The post.c code is missing braces around the pass case, and as a
result, the diagnostic function will post both fail and pass for
a failed test.  The reason for this bug is probably the incorrect
indentation used, so when reading the code it seems like there
are proper braces.

Indent the code to the correct depth and put proper braces around
the "else" branch of the "if" statement.

Signed-off-by: James Kosin <jkosin@intcomgrp.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
post/post.c

index 76602243e70d088ad52e9adc4366ddb8ffc39030..852d6a5dab51ca84623487658c7d0b36abcf13be 100644 (file)
@@ -293,18 +293,18 @@ static int post_run_single (struct post_test *test,
                                        gd->flags |= GD_FLG_POSTSTOP;
                        }
                } else {
-               if ((*test->test) (flags) != 0) {
-                       post_log ("FAILED\n");
-                       show_boot_progress (-32);
-                       show_post_progress(i, POST_AFTER, POST_FAILED);
-                       if (test_flags & POST_CRITICAL)
-                               gd->flags |= GD_FLG_POSTFAIL;
-                       if (test_flags & POST_STOP)
-                               gd->flags |= GD_FLG_POSTSTOP;
-               }
-               else
-                       post_log ("PASSED\n");
-                       show_post_progress(i, POST_AFTER, POST_PASSED);
+                       if ((*test->test)(flags) != 0) {
+                               post_log("FAILED\n");
+                               show_boot_progress(-32);
+                               show_post_progress(i, POST_AFTER, POST_FAILED);
+                               if (test_flags & POST_CRITICAL)
+                                       gd->flags |= GD_FLG_POSTFAIL;
+                               if (test_flags & POST_STOP)
+                                       gd->flags |= GD_FLG_POSTSTOP;
+                       } else {
+                               post_log("PASSED\n");
+                               show_post_progress(i, POST_AFTER, POST_PASSED);
+                       }
                }
 
                if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) {