diff options
| author | danh-arm <dan.handley@arm.com> | 2015-10-14 12:12:38 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-10-14 12:12:38 +0100 |
| commit | 3679240ac06d502b832854c882ea06e1de7db333 (patch) | |
| tree | eba3070e24df7ec156b9371ebdba749eb9af70ac | |
| parent | 6e9fa3866d2f6382bec5f3e2a215351386a3331b (diff) | |
| parent | 22b0eda5d2fae525b0bb1191f1e1ef1bdbf1e2fc (diff) | |
Merge pull request #406 from sandrine-bailleux/sb/cci-init-fix-assertion
Fix debug assertion in deprecated CCI-400 driver
| -rw-r--r-- | drivers/arm/cci400/cci400.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/arm/cci400/cci400.c b/drivers/arm/cci400/cci400.c index 242e1fa4..4b1181b4 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"); |