Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
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
62854fce
Unverified
Commit
62854fce
authored
7 years ago
by
davidcunado-arm
Committed by
GitHub
7 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1183 from jeenu-arm/sdei-reset-fix
SDEI: Fix return value of reset calls
parents
c1e7ae0a
ad55b97a
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
v1.5
v1.5-rc3
v1.5-rc2
v1.5-rc1
v1.5-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
services/std_svc/sdei/sdei_main.c
+2
-2
services/std_svc/sdei/sdei_main.c
with
2 additions
and
2 deletions
+2
-2
services/std_svc/sdei/sdei_main.c
View file @
62854fce
...
...
@@ -795,7 +795,7 @@ static int sdei_private_reset(void)
*/
ret
=
sdei_event_unregister
(
map
->
ev_num
);
if
((
ret
==
SDEI_EPEND
)
&&
(
final_ret
==
0
))
final_ret
=
ret
;
final_ret
=
SDEI_EDENY
;
}
return
final_ret
;
...
...
@@ -817,7 +817,7 @@ static int sdei_shared_reset(void)
*/
ret
=
sdei_event_unregister
(
map
->
ev_num
);
if
((
ret
==
SDEI_EPEND
)
&&
(
final_ret
==
0
))
final_ret
=
ret
;
final_ret
=
SDEI_EDENY
;
}
if
(
final_ret
!=
0
)
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help