Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 69231670eb952357809488fa58cffef5596e9c63..d7bb6974efb56b6070a6c9067bd87ba55a7273da 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -119,6 +119,8 @@ NORET_TYPE void panic(const char * fmt, ...)
                        }
                        mdelay(PANIC_TIMER_STEP);
                }
+       }
+       if (panic_timeout != 0) {
                /*
                 * This will not be a clean reboot, with everything
                 * shutting down.  But if there is a chance of