From: Simon Glass Date: Thu, 2 Oct 2014 01:57:22 +0000 (-0600) Subject: initcall: Display error number when an error occurs X-Git-Tag: KARO-TXA5-2015-06-26~525^2~11 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=aacc6c5d106f33bec2b2371411922ff7d424beed initcall: Display error number when an error occurs Now that some initcall functions return a useful error number, display it when something goes wrong. Signed-off-by: Simon Glass Acked-by: Igor Grinberg --- diff --git a/lib/initcall.c b/lib/initcall.c index 7597bad555..39f4b3f8ad 100644 --- a/lib/initcall.c +++ b/lib/initcall.c @@ -15,14 +15,16 @@ int initcall_run_list(const init_fnc_t init_sequence[]) for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { unsigned long reloc_ofs = 0; + int ret; if (gd->flags & GD_FLG_RELOC) reloc_ofs = gd->reloc_off; debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs); - if ((*init_fnc_ptr)()) { - printf("initcall sequence %p failed at call %p\n", + ret = (*init_fnc_ptr)(); + if (ret) { + printf("initcall sequence %p failed at call %p (err=%d)\n", init_sequence, - (char *)*init_fnc_ptr - reloc_ofs); + (char *)*init_fnc_ptr - reloc_ofs, ret); return -1; } }