diff options
| author | Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com> | 2018-01-31 14:47:12 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-01 08:05:53 -0500 |
| commit | 2166ebf7831674508425daf50c78e481083c6462 (patch) | |
| tree | 7f872e44844c2ec406737d71a71188368e3be38a /env/nvram.c | |
| parent | 31f044bd91df58bed6bb8cfadfc187eedac1442e (diff) | |
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>
Diffstat (limited to 'env/nvram.c')
| -rw-r--r-- | env/nvram.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/env/nvram.c b/env/nvram.c index c8b34754ef..6f76fe4b8d 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -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) |