Skip to content

Commit dfd64d1

Browse files
tmlindgregkh
authored andcommitted
ARM: OMAP4+: Fix bad fallthrough for cpuidle
commit cbf2642872333547b56b8c4d943f5ed04ac9a4ee upstream. We don't want to fall through to a bunch of errors for retention if PM_OMAP4_CPU_OSWR_DISABLE is not configured for a SoC. Fixes: 6099dd3 ("ARM: OMAP5 / DRA7: Enable CPU RET on suspend") Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 04dc1be commit dfd64d1

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

arch/arm/mach-omap2/omap-mpuss-lowpower.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,9 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)
243243
save_state = 1;
244244
break;
245245
case PWRDM_POWER_RET:
246-
if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) {
246+
if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE))
247247
save_state = 0;
248-
break;
249-
}
248+
break;
250249
default:
251250
/*
252251
* CPUx CSWR is invalid hardware state. Also CPUx OSWR

0 commit comments

Comments
 (0)