diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-16 22:25:55 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-16 22:25:55 -0800 |
| commit | 941d3156e9a5d6826b17d451ccac876aa2f7a0d2 (patch) | |
| tree | ff66a9e5976cf6e78cfd5efcca1a17883671e289 /arch/arm | |
| parent | dcde6b16eb6fda3f6434074e08b141c3d1f93308 (diff) | |
| parent | f0e8faa7a5e894b0fc99d24be1b18685a92ea466 (diff) | |
| download | linux-stable-941d3156e9a5d6826b17d451ccac876aa2f7a0d2.tar.gz linux-stable-941d3156e9a5d6826b17d451ccac876aa2f7a0d2.tar.bz2 linux-stable-941d3156e9a5d6826b17d451ccac876aa2f7a0d2.zip | |
Merge tag 'ux500-fix-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
A single PM fix from Arnd
* tag 'ux500-fix-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c index 8538910db202..a970e7fcba9e 100644 --- a/arch/arm/mach-ux500/pm.c +++ b/arch/arm/mach-ux500/pm.c @@ -134,8 +134,8 @@ bool prcmu_pending_irq(void) */ bool prcmu_is_cpu_in_wfi(int cpu) { - return readl(PRCM_ARM_WFI_STANDBY) & cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : - PRCM_ARM_WFI_STANDBY_WFI0; + return readl(PRCM_ARM_WFI_STANDBY) & + (cpu ? PRCM_ARM_WFI_STANDBY_WFI1 : PRCM_ARM_WFI_STANDBY_WFI0); } /* |