Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
e9ced6f2
Commit
e9ced6f2
authored
Jan 31, 2017
by
danh-arm
Committed by
GitHub
Jan 31, 2017
Browse files
Merge pull request #825 from dp-arm/dp/simplify-cond
tbbr: Simplify conditional
parents
bac75297
f3ded378
Changes
1
Hide whitespace changes
Inline
Side-by-side
plat/common/tbbr/plat_tbbr.c
View file @
e9ced6f2
...
@@ -60,7 +60,7 @@ int plat_set_nv_ctr2(void *cookie, const auth_img_desc_t *img_desc,
...
@@ -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
* has been signed with the ROT key. Non Trusted NV counter
* updates are unconditional.
* 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
);
return
plat_set_nv_ctr
(
cookie
,
nv_ctr
);
/*
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment