]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mpc83xx: gazerbeam: Update sysinfo_get error handling
authorMichal Suchanek <msuchanek@suse.de>
Wed, 12 Oct 2022 19:58:04 +0000 (21:58 +0200)
committerSimon Glass <sjg@chromium.org>
Tue, 18 Oct 2022 03:17:12 +0000 (21:17 -0600)
In a later patch sysinfo_get will be changed to return the device in cae
of an error. Set sysinfo to NULL on error to preserve previous behavior.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
board/gdsys/mpc8308/gazerbeam.c

index 3d4a7e57feeddeada820d8ea2237a00b4db168b2..ba88401f13da5841ee91cc335a095387e16ac0ce 100644 (file)
@@ -49,8 +49,10 @@ int board_early_init_r(void)
        int mc = 0;
        int con = 0;
 
-       if (sysinfo_get(&sysinfo))
+       if (sysinfo_get(&sysinfo)) {
                puts("Could not find sysinfo information device.\n");
+               sysinfo = NULL;
+       }
 
        /* Initialize serdes */
        uclass_get_device_by_phandle(UCLASS_MISC, sysinfo, "serdes", &serdes);
@@ -92,8 +94,10 @@ int checksysinfo(void)
        int mc = 0;
        int con = 0;
 
-       if (sysinfo_get(&sysinfo))
+       if (sysinfo_get(&sysinfo)) {
                puts("Could not find sysinfo information device.\n");
+               sysinfo = NULL;
+       }
 
        sysinfo_get_int(sysinfo, BOARD_MULTICHANNEL, &mc);
        sysinfo_get_int(sysinfo, BOARD_VARIANT, &con);
@@ -130,8 +134,10 @@ int last_stage_init(void)
        struct udevice *tpm;
        int ret;
 
-       if (sysinfo_get(&sysinfo))
+       if (sysinfo_get(&sysinfo)) {
                puts("Could not find sysinfo information device.\n");
+               sysinfo = NULL;
+       }
 
        if (sysinfo) {
                int res = sysinfo_get_int(sysinfo, BOARD_HWVERSION,