board: toradex: Fix variant (wifi/non-wifi) selection
authorFrancesco Dolcini <francesco.dolcini@toradex.com>
Mon, 14 Jul 2025 08:44:16 +0000 (10:44 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 22 Jul 2025 17:28:04 +0000 (11:28 -0600)
Do not dereference NULL, when "variant" env variable is not present.

Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
board/toradex/verdin-am62/verdin-am62.c
board/toradex/verdin-am62p/verdin-am62p.c
board/toradex/verdin-imx8mm/verdin-imx8mm.c
board/toradex/verdin-imx8mp/verdin-imx8mp.c

index eca2cc8..100cfb9 100644 (file)
@@ -95,7 +95,7 @@ static void select_dt_from_module_version(void)
        else
                strlcpy(&variant[0], "nonwifi", sizeof(variant));
 
-       if (strcmp(variant, env_variant)) {
+       if (!env_variant || strcmp(variant, env_variant)) {
                printf("Setting variant to %s\n", variant);
                env_set("variant", variant);
        }
index 43d1c93..a7124ec 100644 (file)
@@ -124,7 +124,7 @@ static void select_dt_from_module_version(void)
        else
                strlcpy(&variant[0], "nonwifi", sizeof(variant));
 
-       if (strcmp(variant, env_variant)) {
+       if (!env_variant || strcmp(variant, env_variant)) {
                printf("Setting variant to %s\n", variant);
                env_set("variant", variant);
        }
index 066e8db..04c918a 100644 (file)
@@ -100,7 +100,7 @@ static void select_dt_from_module_version(void)
                break;
        }
 
-       if (strcmp(variant, env_variant)) {
+       if (!env_variant || strcmp(variant, env_variant)) {
                printf("Setting variant to %s\n", variant);
                env_set("variant", variant);
        }
index e57ec3b..34ce255 100644 (file)
@@ -90,7 +90,7 @@ static void select_dt_from_module_version(void)
        else
                strlcpy(&variant[0], "nonwifi", sizeof(variant));
 
-       if (strcmp(variant, env_variant)) {
+       if (!env_variant || strcmp(variant, env_variant)) {
                printf("Setting variant to %s\n", variant);
                env_set("variant", variant);
        }