Merge pull request #825 from dp-arm/dp/simplify-cond

tbbr: Simplify conditional

Merge pull request #825 from dp-arm/dp/simplify-cond
tbbr: Simplify conditional
e9ced6f2 · danh-arm · GitHub · bac75297 · f3ded378 · e9ced6f2
Commit e9ced6f2 authored 8 years ago by danh-arm Committed by GitHub 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 1 deletion
+1 -1
--- 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);

 	/*