summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2018-09-18 15:20:41 +0100
committerGitHub <noreply@github.com>2018-09-18 15:20:41 +0100
commitd301b88b0e1e1d2f7e532111c7fcaab9ad6fd41a (patch)
tree7f9ccb18bf3c383df9b64357559cf2dacaaa93ee
parent4b8f7bf07ae262fa90adf216465c0fa67721e9b0 (diff)
parent0153806b9e3756ad81629bbfd2a0f909a1b579fc (diff)
Merge pull request #1577 from antonio-nino-diaz-arm/an/trustyv1.6-rc1
trusty: Fix return value of trusty_init()
-rw-r--r--services/spd/trusty/trusty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/spd/trusty/trusty.c b/services/spd/trusty/trusty.c
index cc808e2b..33358362 100644
--- a/services/spd/trusty/trusty.c
+++ b/services/spd/trusty/trusty.c
@@ -322,7 +322,7 @@ static int32_t trusty_init(void)
fpregs_context_restore(get_fpregs_ctx(cm_get_context(NON_SECURE)));
cm_set_next_eret_context(NON_SECURE);
- return 0;
+ return 1;
}
static void trusty_cpu_suspend(uint32_t off)