diff options
| author | Dima Zavin <dima@android.com> | 2011-10-09 11:47:35 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:39:13 -0800 |
| commit | ee4afb6a61624628c9080c18bcdfe79be72d1667 (patch) | |
| tree | badc798c44853d6d3dcc066d4aa44c458865ae05 /arch/arm/common | |
| parent | 1168105523cb73c8a411e58fc604c912d806de01 (diff) | |
ARM: common: fiq_debugger: do not disable debug when console is enabled
Change-Id: I5f8074a860f9b143ee0c87296683bbf2cffb5a36
Signed-off-by: Dima Zavin <dima@android.com>
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/fiq_debugger.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); } |