From: Tony Lindgren Date: Mon, 7 Nov 2016 23:50:11 +0000 (-0700) Subject: ARM: OMAP4+: Fix bad fallthrough for cpuidle X-Git-Tag: v4.10-rc1~85^2~11^2^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbf2642872333547b56b8c4d943f5ed04ac9a4ee;p=platform%2Fkernel%2Flinux-exynos.git ARM: OMAP4+: Fix bad fallthrough for cpuidle 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: 6099dd37c669 ("ARM: OMAP5 / DRA7: Enable CPU RET on suspend") Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c index 94428b4..7d62ad4 100644 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c @@ -245,10 +245,9 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state) save_state = 1; break; case PWRDM_POWER_RET: - if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) { + if (IS_PM44XX_ERRATUM(PM_OMAP4_CPU_OSWR_DISABLE)) save_state = 0; - break; - } + break; default: /* * CPUx CSWR is invalid hardware state. Also CPUx OSWR