From 22b0eda5d2fae525b0bb1191f1e1ef1bdbf1e2fc Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Fri, 2 Oct 2015 08:51:17 +0100 Subject: [PATCH] Fix debug assertion in deprecated CCI-400 driver This patch fixes a copy and paste issue that resulted in the cluster indexes not being checked as intended. Note that this fix applies to the deprecated CCI-400 driver, not the unified one. Change-Id: I497132a91c236690e5eaff908f2db5c8c65e85ab --- drivers/arm/cci400/cci400.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/arm/cci400/cci400.c b/drivers/arm/cci400/cci400.c index 242e1fa4f..4b1181b47 100644 --- a/drivers/arm/cci400/cci400.c +++ b/drivers/arm/cci400/cci400.c @@ -48,14 +48,14 @@ void cci_init(uintptr_t cci_base, /* * Check the passed arguments are valid. The cluster indices must be * less than MAX_CLUSTERS, not the same as each other and at least one - * of them must be refer to a valid cluster index. + * of them must refer to a valid cluster index. */ assert(cci_base); assert(slave_iface3_cluster_ix < MAX_CLUSTERS); assert(slave_iface4_cluster_ix < MAX_CLUSTERS); assert(slave_iface3_cluster_ix != slave_iface4_cluster_ix); assert((slave_iface3_cluster_ix >= 0) || - (slave_iface3_cluster_ix >= 0)); + (slave_iface4_cluster_ix >= 0)); WARN("Please migrate to common cci driver, This driver will be" \ " deprecated in future\n");