diff --git a/drivers/staging/android/fiq_debugger/fiq_debugger.c b/drivers/staging/android/fiq_debugger/fiq_debugger.c
index fda77661f3f4..1e0671b60c4c 100644
--- a/drivers/staging/android/fiq_debugger/fiq_debugger.c
+++ b/drivers/staging/android/fiq_debugger/fiq_debugger.c
@@ -1542,6 +1542,10 @@ console_out:
 	register_console(&state->console);
 	fiq_debugger_tty_init_one(state);
 #endif
+
+	/* switch to cpu0 default */
+	fiq_debugger_switch_cpu(state, 0);
+
 	return 0;
 
 err_register_irq: