[PATCH] vesafb: Fix return code of vesafb_setcolreg

[powerpc.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 4a2f089..9a970d3 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -490,6 +490,7 @@ asmlinkage void __init start_kernel(void)
        hrtimers_init();
        softirq_init();
        time_init();
+       timekeeping_init();
 
        /*
         * HACK ALERT! This is early. We're enabling the console before
@@ -582,7 +583,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;
                }