aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-hs/pm.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-hs/pm.c b/arch/arm/mach-hs/pm.c
index ca6acabe1e60..05df7a8f0374 100644
--- a/arch/arm/mach-hs/pm.c
+++ b/arch/arm/mach-hs/pm.c
@@ -47,6 +47,9 @@
#include <asm/hardware/gic.h>
#include <linux/irq.h>
#endif
+#ifdef CONFIG_HSK3_CONSOLE_WORKAROUND
+#include <linux/console.h>
+#endif
/* resources in power management */
struct iomap_resource {
@@ -171,7 +174,10 @@ static int wrapper_hs_godpsleep(void)
hilpm_cpu_godpsleep();
#ifdef CONFIG_HSK3_CONSOLE_WORKAROUND
- debuguart_reinit();
+ /* debuguart needs to be reinit when "no_console_suspend" is set.
+ */
+ if (!console_suspend_enabled)
+ debuguart_reinit();
#endif
return 0;