env: make env drivers propagate env_import return value
For multiple env drivers to correctly implement fallback when one environment fails to load (e.g. crc error), the return value of env_import has to be propagated by all env driver's load function. Without this change, the first driver that succeeds to load an environment with an invalid CRC return 0 (success) and no other drivers are checked. Signed-off-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
committed by
Tom Rini
parent
31f044bd91
commit
2166ebf783
4
env/nvram.c
vendored
4
env/nvram.c
vendored
@@ -60,9 +60,7 @@ static int env_nvram_load(void)
|
||||
#else
|
||||
memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
|
||||
#endif
|
||||
env_import(buf, 1);
|
||||
|
||||
return 0;
|
||||
return env_import(buf, 1);
|
||||
}
|
||||
|
||||
static int env_nvram_save(void)
|
||||
|
||||
Reference in New Issue
Block a user