diff options
| -rw-r--r-- | common/board_r.c | 6 | ||||
| -rw-r--r-- | test/dm/fwu_mdata.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/common/board_r.c b/common/board_r.c index 8cf0e14679c..5d37345ca09 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -569,11 +569,15 @@ static int dm_announce(void) static int run_main_loop(void) { + int ret; + #ifdef CONFIG_SANDBOX sandbox_main_loop_init(); #endif - event_notify_null(EVT_MAIN_LOOP); + ret = event_notify_null(EVT_MAIN_LOOP); + if (ret) + return ret; /* main_loop() can return to retry autoboot, if so just run it again */ for (;;) diff --git a/test/dm/fwu_mdata.c b/test/dm/fwu_mdata.c index b7680632f95..643b647af0a 100644 --- a/test/dm/fwu_mdata.c +++ b/test/dm/fwu_mdata.c @@ -100,7 +100,7 @@ static int dm_test_fwu_mdata_read(struct unit_test_state *uts) * Trigger lib/fwu_updates/fwu.c fwu_boottime_checks() * to populate g_dev global pointer in that library. */ - event_notify_null(EVT_MAIN_LOOP); + ut_assertok(event_notify_null(EVT_MAIN_LOOP)); ut_assertok(uclass_first_device_err(UCLASS_FWU_MDATA, &dev)); ut_assertok(fwu_init()); @@ -127,7 +127,7 @@ static int dm_test_fwu_mdata_write(struct unit_test_state *uts) * Trigger lib/fwu_updates/fwu.c fwu_boottime_checks() * to populate g_dev global pointer in that library. */ - event_notify_null(EVT_MAIN_LOOP); + ut_assertok(event_notify_null(EVT_MAIN_LOOP)); ut_assertok(uclass_first_device_err(UCLASS_FWU_MDATA, &dev)); |