commit b87c7304c02f78e3fd294a0c08ff9a3018338f83
author Manish Pandey <manish.pandey2@arm.com> Fri Mar 27 21:24:33 2020 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Fri Mar 27 21:24:33 2020 +0000
tree 362ec5a33076cd85e464641ca03bf363e4221271
parent 2ff5527df3d057d0a417de1378f0760603cca731
parent 61c509ccb75a669f486c1762f5d9bf8d50dee491

Merge "plat/arm/sgi: fix the incorrect check for SCMI channel ID" into integration

plat/arm/css/sgi/sgi_bl31_setup.c

diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c
index fcb7e1f..a4aed00 100644
--- a/plat/arm/css/sgi/sgi_bl31_setup.c
+++ b/plat/arm/css/sgi/sgi_bl31_setup.c
@@ -75,7 +75,7 @@
 {
 	if (sgi_plat_info.platform_id == RD_N1E1_EDGE_SID_VER_PART_NUM ||
 		sgi_plat_info.platform_id == RD_DANIEL_SID_VER_PART_NUM) {
-		if (channel_id >= sizeof(rd_n1e1_edge_scmi_plat_info))
+		if (channel_id >= ARRAY_SIZE(rd_n1e1_edge_scmi_plat_info))
 			panic();
 		return &rd_n1e1_edge_scmi_plat_info[channel_id];
 	}