diff --git a/[refs] b/[refs] index 5f75317f9ba2..614263f4edc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e59a8db8d9b7c02e0bbefbeb18a3836288a97b8a +refs/heads/master: a029db43986e23677498ab4d84bb61b05de83484 diff --git a/trunk/arch/arm/mach-shmobile/pm-sh7372.c b/trunk/arch/arm/mach-shmobile/pm-sh7372.c index 77b8fc12fc2f..fcf8b1761aef 100644 --- a/trunk/arch/arm/mach-shmobile/pm-sh7372.c +++ b/trunk/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 = {