From c932945e525708bd2e431647e0ba29aa7b89ddae Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 1 May 2006 12:15:52 -0700
Subject: [PATCH] --- yaml --- r: 26395 b: refs/heads/master c:
 f3a19cb45f4730c4ce09ca9bccf197efd010dc3b h: refs/heads/master i:   26393:
 73842b70d40c5e6c3bcc74e8875f7b2297204d6b   26391:
 99f519f595d5f986eb53038d94f14e81b8939d32 v: v3

---
 [refs]            | 2 +-
 trunk/init/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 00e68e6a37f9..02d89fdd9e8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42e4c8585f8cbbfac3b70aa2d0a4f869509a0354
+refs/heads/master: f3a19cb45f4730c4ce09ca9bccf197efd010dc3b
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 4a2f0898dda1..f715b9b89753 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -582,7 +582,7 @@ static void __init do_initcalls(void)
 
 		result = (*call)();
 
-		if (result && (result != -ENODEV || initcall_debug)) {
+		if (result && result != -ENODEV && initcall_debug) {
 			sprintf(msgbuf, "error code %d", result);
 			msg = msgbuf;
 		}