diff options
| author | danh-arm <dan.handley@arm.com> | 2017-01-31 15:38:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-31 15:38:19 +0000 |
| commit | e9ced6f291a5901dad06b478fcd2b5d7ff63dd76 (patch) | |
| tree | c630efb5f0ff3b3ffc89fc6e0c711995ba7cfd97 | |
| parent | bac75297ad9808d4e5ad2f82d2c498cac8b7260d (diff) | |
| parent | f3ded3782c565856b6e0174fd3fdaeee1b8dadcf (diff) | |
Merge pull request #825 from dp-arm/dp/simplify-cond
tbbr: Simplify conditional
| -rw-r--r-- | plat/common/tbbr/plat_tbbr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plat/common/tbbr/plat_tbbr.c b/plat/common/tbbr/plat_tbbr.c index 475564a6..fde4d544 100644 --- a/plat/common/tbbr/plat_tbbr.c +++ b/plat/common/tbbr/plat_tbbr.c @@ -60,7 +60,7 @@ int plat_set_nv_ctr2(void *cookie, const auth_img_desc_t *img_desc, * has been signed with the ROT key. Non Trusted NV counter * updates are unconditional. */ - if (!trusted_nv_ctr || (trusted_nv_ctr && img_desc->parent == NULL)) + if (!trusted_nv_ctr || img_desc->parent == NULL) return plat_set_nv_ctr(cookie, nv_ctr); /* |