From: Dima Zavin <dima@android.com>
Date: Sun, 9 Oct 2011 18:47:35 +0000 (-0700)
Subject: ARM: common: fiq_debugger: do not disable debug when console is enabled
X-Git-Tag: firefly_0821_release~7613^2~256
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48ef31abe4ee8b75304602c0dfff25184efb9620;p=firefly-linux-kernel-4.4.55.git

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 080f69edd75a..d44690dae546 100644
--- 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");
 		}