commit 30a82f0e8256eac1dbff93c9af34e38e3808e58f
author Dimitris Papastamos <dimitris.papastamos@arm.com> Thu Apr 12 09:20:12 2018 +0100
committer GitHub <noreply@github.com> Thu Apr 12 09:20:12 2018 +0100
tree 66dec1ea6f9fed7194358eb17ea8f39c03a634e6
parent 72e43075e2a59ae57b64a2875e7bb5d1c3033f87
parent 62f44c0a0cc9caf15e89e3f4827a949a25a35d17

Merge pull request #1353 from JiafeiPan/upstream-platform-psci-bug

layerscape: fix integer handling issues

plat/layerscape/board/ls1043/ls1043_psci.c

diff --git a/plat/layerscape/board/ls1043/ls1043_psci.c b/plat/layerscape/board/ls1043/ls1043_psci.c
index a41e79e..1c83df4 100644
--- a/plat/layerscape/board/ls1043/ls1043_psci.c
+++ b/plat/layerscape/board/ls1043/ls1043_psci.c
@@ -94,10 +94,10 @@
 static int ls1043_pwr_domain_on(u_register_t mpidr)
 {
 	int core_pos = plat_core_pos_by_mpidr(mpidr);
-	uint32_t core_mask = 1 << core_pos;
-	uint32_t brr;
+	uint32_t core_mask, brr;
 
 	assert(core_pos >= 0 && core_pos < PLATFORM_CORE_COUNT);
+	core_mask = 1 << core_pos;
 
 	/* set warm boot entry */
 	mmio_write_32(LS_SCFG_BASE + LS_SCFG_SCRATCHRW0_OFFSET,