diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:22:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:22:54 +0100 |
| commit | c6c3a3a03e6de52866bc81a32fc551733625d553 (patch) | |
| tree | b55967a9163dba315e2543d648de758b82c85fa1 /arch/arm/mach-omap2/pm34xx.c | |
| parent | 07e87e15b969a05a7943d7ff1abc2d8da287171c (diff) | |
| parent | 8aca3ab5865f8cfbde841b6daf9442cc2279ced3 (diff) | |
Merge branch 'omap/cleanup' into next/cleanup2
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 7255d9bce86..c8cbd00a41a 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) |