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

tbbr: Simplify conditional
This commit is contained in:
danh-arm 2017-01-31 15:38:19 +00:00 committed by GitHub
commit e9ced6f291
1 changed files with 1 additions and 1 deletions

View File

@ -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);
/*