public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: "Marek Behún" <kabel@kernel.org>
To: "Simon Glass" <sjg@chromium.org>, "Stefan Roese" <sr@denx.de>,
	"Pali Rohár" <pali@kernel.org>
Cc: u-boot@lists.denx.de, "Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH 1/5] env: Don't set ready flag if import failed in env_set_default()
Date: Thu, 28 Oct 2021 05:28:06 +0200	[thread overview]
Message-ID: <20211028032810.18146-2-kabel@kernel.org> (raw)
In-Reply-To: <20211028032810.18146-1-kabel@kernel.org>

From: Marek Behún <marek.behun@nic.cz>

Do not set GD_FLG_ENV_READY nor GD_FLG_ENV_DEFAULT if failed importing
in env_set_default().

Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 env/common.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/env/common.c b/env/common.c
index 99729ca002..2aa23545ba 100644
--- a/env/common.c
+++ b/env/common.c
@@ -261,9 +261,11 @@ void env_set_default(const char *s, int flags)
 	flags |= H_DEFAULT;
 	if (himport_r(&env_htab, default_environment,
 			sizeof(default_environment), '\0', flags, 0,
-			0, NULL) == 0)
+			0, NULL) == 0) {
 		pr_err("## Error: Environment import failed: errno = %d\n",
 		       errno);
+		return;
+	}
 
 	gd->flags |= GD_FLG_ENV_READY;
 	gd->flags |= GD_FLG_ENV_DEFAULT;
-- 
2.32.0


  reply	other threads:[~2021-10-28  3:28 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-28  3:28 [PATCH 0/5] Board specific runtime determined default env Marek Behún
2021-10-28  3:28 ` Marek Behún [this message]
2021-10-29  3:17   ` [PATCH 1/5] env: Don't set ready flag if import failed in env_set_default() Simon Glass
2021-10-28  3:28 ` [PATCH 2/5] env: Fix env_get() when returning empty string using env_get_f() Marek Behún
2021-10-29  3:17   ` Simon Glass
2021-10-29  8:51     ` Marek Behún
2021-10-29  9:03     ` Pali Rohár
2021-10-31 13:07       ` Simon Glass
2021-10-31 15:27         ` Marek Behún
2021-10-28  3:28 ` [PATCH 3/5] env: Simplify env_get_default() Marek Behún
2021-10-29  3:17   ` Simon Glass
2021-10-28  3:28 ` [PATCH 4/5] env: Add support for board specific special default environment Marek Behún
2021-10-29  3:17   ` Simon Glass
2021-10-29  8:57     ` Marek Behún
2021-10-31 13:07       ` Simon Glass
2021-10-28  3:28 ` [PATCH 5/5] arm: mvebu: Espressobin: Use new API for setting default env at runtime Marek Behún
2021-10-29  3:17   ` Simon Glass
2021-10-31 20:15   ` Pali Rohár
2021-11-02 14:57     ` Simon Glass
2021-11-03 10:48       ` Pali Rohár
2021-10-29  3:17 ` [PATCH 0/5] Board specific runtime determined default env Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211028032810.18146-2-kabel@kernel.org \
    --to=kabel@kernel.org \
    --cc=marek.behun@nic.cz \
    --cc=pali@kernel.org \
    --cc=sjg@chromium.org \
    --cc=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox