ARM: common: fiq_debugger: do not disable debug when console is enabled

Change-Id: I5f8074a860f9b143ee0c87296683bbf2cffb5a36
Signed-off-by: Dima Zavin <dima@android.com>

diff --git a/arch/arm/common/fiq_debugger.c b/arch/arm/common/fiq_debugger.c
index 080f69edd75a4b954961127b03c131c70abdd6b3..d44690dae546e43fb0f1773d87eddd5748f2b885 100644 (file)
--- a/arch/arm/common/fiq_debugger.c
+++ b/arch/arm/common/fiq_debugger.c
@@ -531,7 +531,7 @@ static void sleep_timer_expired(unsigned long data)
        struct fiq_debugger_state *state = (struct fiq_debugger_state *)data;
 
        if (state->uart_clk_enabled && !state->no_sleep) {
-               if (state->debug_enable) {
+               if (state->debug_enable && !state->console_enable) {
                        state->debug_enable = false;
                        debug_printf_nfiq(state, "suspending fiq debugger\n");
                }