diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-09-13 11:18:44 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-09-16 09:44:50 -0700 |
| commit | dca2d0eb5917ff132d9be13f0afa9ae5d4e80580 (patch) | |
| tree | f81db8f8db8f45ff4a71c7b2208f5c66173c0446 /arch/arm/mach-omap2/pm34xx.c | |
| parent | e9a5190aa30d9d9eeead10a978609f46869bfe50 (diff) | |
| download | op-kernel-dev-dca2d0eb5917ff132d9be13f0afa9ae5d4e80580.zip op-kernel-dev-dca2d0eb5917ff132d9be13f0afa9ae5d4e80580.tar.gz | |
OMAP3: PM: fix UART handling when using no_console_suspend
During the idle/suspend path, we expect the console lock to be held so
that no console output is done during/after the UARTs are idled.
However, when using the no_console_suspend argument on the
command-line, the console driver does not take the console lock. This
allows the possibility of console activity after UARTs have been
disabled.
To fix, update the current is_suspending() to also check the
console_suspend_enabled flag.
Reported-by: Abhilash Koyamangalath <abhilash.kv@ti.com>
Tested-by: Abhilash Koyamangalath <abhilash.kv@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 7255d9b..c8cbd00 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -55,7 +55,7 @@ static suspend_state_t suspend_state = PM_SUSPEND_ON; static inline bool is_suspending(void) { - return (suspend_state != PM_SUSPEND_ON); + return (suspend_state != PM_SUSPEND_ON) && console_suspend_enabled; } #else static inline bool is_suspending(void) |
