diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 03:02:30 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-17 03:02:30 +0400 |
| commit | 97740400bc76b64781d01f8cdfbcf750582006ef (patch) | |
| tree | 85900329fbce72011339ab2348dcf13dde2a64fd /arch/arm | |
| parent | 408e057870c8680a50963b08f9f7efaa151a74ec (diff) | |
| parent | ee34a37049114303011e154478c63b977bcff24c (diff) | |
| download | linux-97740400bc76b64781d01f8cdfbcf750582006ef.tar.xz | |
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / Hibernate: Drop the check of swap space size for compressed image
PM / shmobile: fix A3SP suspend method
PM / Domains: Skip governor functions for CONFIG_PM_RUNTIME unset
PM / Domains: Fix build for CONFIG_PM_SLEEP unset
PM: Make sysrq-o be available for CONFIG_PM unset
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-sh7372.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index 77b8fc12fc2f..fcf8b1761aef 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c @@ -276,7 +276,7 @@ static int sh7372_a3sp_suspend(void) * Serial consoles make use of SCIF hardware located in A3SP, * keep such power domain on if "no_console_suspend" is set. */ - return console_suspend_enabled ? -EBUSY : 0; + return console_suspend_enabled ? 0 : -EBUSY; } struct sh7372_pm_domain sh7372_a3sp = { |