Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 941d3156 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-fix-for-armsoc' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents dcde6b16 f0e8faa7

arch/arm/mach-ux500/pm.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}



/*