diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-08-24 16:30:29 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-08-30 09:22:33 +0100 |
| commit | c9512bca3b69dcb50ac839ce1f6d24a68be46986 (patch) | |
| tree | 9eacb4a8d992cf64f1bd719134baf8eb31292251 /bl31/bl31_main.c | |
| parent | 2a7c9e15c23b376121747ccae78bef91db6225ba (diff) | |
Fix MISRA defects in BL31 common code
Change-Id: I5993b425445ee794e6d2a792c244c0af53640655
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'bl31/bl31_main.c')
| -rw-r--r-- | bl31/bl31_main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 06647412..650181dd 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -103,9 +103,14 @@ void bl31_main(void) /* * If SPD had registerd an init hook, invoke it. */ - if (bl32_init) { + if (bl32_init != NULL) { INFO("BL31: Initializing BL32\n"); - (*bl32_init)(); + + int32_t rc = (*bl32_init)(); + + if (rc != 0) { + ERROR("BL31: BL32 initialization failed (rc = %d)", rc); + } } /* * We are ready to enter the next EL. Prepare entry into the image @@ -167,7 +172,7 @@ void bl31_prepare_next_image_entry(void) /* Program EL3 registers to enable entry into the next EL */ next_image_info = bl31_plat_get_next_image_ep_info(image_type); - assert(next_image_info); + assert(next_image_info != NULL); assert(image_type == GET_SECURITY_STATE(next_image_info->h.attr)); INFO("BL31: Preparing for EL3 exit to %s world\n", |