summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Kosin <jkosin@intcomgrp.com>2011-07-14 08:15:06 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 16:57:49 +0200
commit975afc34dd3ca51ef3f3e7c0c0dcece89dda10ae (patch)
treea3fd400534575b24b085fa9f5e159818dbd4be85
parent14ce91b11530d7b5382adba19031b822f8f3c3fa (diff)
downloadu-boot-imx-975afc34dd3ca51ef3f3e7c0c0dcece89dda10ae.zip
u-boot-imx-975afc34dd3ca51ef3f3e7c0c0dcece89dda10ae.tar.gz
u-boot-imx-975afc34dd3ca51ef3f3e7c0c0dcece89dda10ae.tar.bz2
post: fix indendation/brace confusion
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>
-rw-r--r--post/post.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/post/post.c b/post/post.c
index 7660224..852d6a5 100644
--- a/post/post.c
+++ b/post/post.c
@@ -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)) {