From: Tom Rini Date: Fri, 5 Jun 2020 15:07:34 -0400 Subject: [PATCH 3/6] env: Fix invalid env handling in env_init() In-Reply-To: <20200603000111.7919-3-marex@denx.de> References: <20200603000111.7919-1-marex@denx.de> <20200603000111.7919-3-marex@denx.de> Message-ID: <20200605190734.GF24893@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, Jun 03, 2020 at 02:01:08AM +0200, Marek Vasut wrote: > In case the env storage driver marks environment as ENV_INVALID, we must > reset the $ret return value to -ENOENT to let the env init code reset the > environment to the default one a bit further down. > > Signed-off-by: Marek Vasut > --- > env/env.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/env/env.c b/env/env.c > index dcc25c030b..024d36fdbe 100644 > --- a/env/env.c > +++ b/env/env.c > @@ -300,6 +300,9 @@ int env_init(void) > > debug("%s: Environment %s init done (ret=%d)\n", __func__, > drv->name, ret); > + > + if (gd->env_valid == ENV_INVALID) > + ret = -ENOENT; > } > > if (!prio) Is the storage driver marking the environment as invalid but not returning ENOENT valid? How does all of this work in the case of multiple configured storage drivers? Thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: