From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9E4FC433F5 for ; Thu, 28 Oct 2021 03:28:52 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF7F460EC0 for ; Thu, 28 Oct 2021 03:28:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DF7F460EC0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 89EB483178; Thu, 28 Oct 2021 05:28:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="cbOUQktO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 025018314A; Thu, 28 Oct 2021 05:28:24 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id ECD818316B for ; Thu, 28 Oct 2021 05:28:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 4F09C61167; Thu, 28 Oct 2021 03:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635391695; bh=q7OlQv2UVKfVVi2jfrpaVN4X+4EKTsRQhutrz7nqt7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cbOUQktO2HFasQ5X7iUziYxrAtudXmK15pQhv93oloXbNBtpaArUwQisT6rLHLYkS XR+n4E4p0v8bS5atgUUSwU/Xo+SnLrpNTyKvZ4JCdoeN900e/KLjXmIiKcR7RP/VK9 HNgeaOA0w1zSp/eFvg5MtuUflHIE7tBSKlCCxYF5Hv2Y7H7Dr0xj2Y/MVHzVnleAyL ZngEdb4pN9+M/QwBaATOuYW13d7qyv8GxnWa7tvC6/sOVTJmqTcZkukrbNZqxtlLge bDvhnajvtq1smME8jGeSzR1F62kvPzF8CpsAGmp3VG9wpDSQivQkMeCvUFYj0mvnRr NYYmLp1MDqAHQ== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Simon Glass , Stefan Roese , =?UTF-8?q?Pali=20Roh=C3=A1r?= Cc: u-boot@lists.denx.de, =?UTF-8?q?Marek=20Beh=C3=BAn?= 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 Message-Id: <20211028032810.18146-2-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211028032810.18146-1-kabel@kernel.org> References: <20211028032810.18146-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún 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 --- 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