summaryrefslogtreecommitdiff
path: root/lib/initcall.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-03-13 18:47:16 -0400
committerTom Rini <trini@konsulko.com>2024-03-13 18:47:16 -0400
commit3987e15e88a1d6a9a211b7637728fcc0acf74fbe (patch)
tree5259b77db728b368c4900579c2d44337ae6de9e7 /lib/initcall.c
parent213ffd49bdbd30512661eaf47b7445ef8a81bcdb (diff)
parent969ea37dfd04e2800828fe2a26cd354d22569d18 (diff)
Merge branch '2024-04-13-assorted-fixes' into next
- Fix bootm_low handling, CONFIG_64BIT usage fixes, RNG fixes, cli history fixes, allow bootelf to pass a device tree address, other assorted fixes.
Diffstat (limited to 'lib/initcall.c')
-rw-r--r--lib/initcall.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/initcall.c b/lib/initcall.c
index ce317af213a..c8e2b0f6a38 100644
--- a/lib/initcall.c
+++ b/lib/initcall.c
@@ -55,7 +55,7 @@ int initcall_run_list(const init_fnc_t init_sequence[])
init_fnc_t func;
int ret = 0;
- for (ptr = init_sequence; func = *ptr, !ret && func; ptr++) {
+ for (ptr = init_sequence; func = *ptr, func; ptr++) {
type = initcall_is_event(func);
if (type) {
@@ -71,6 +71,8 @@ int initcall_run_list(const init_fnc_t init_sequence[])
}
ret = type ? event_notify_null(type) : func();
+ if (ret)
+ break;
}
if (ret) {