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:
Simon Goldschmidt
2018-01-31 14:47:12 +01:00
committed by Tom Rini
parent 31f044bd91
commit 2166ebf783
10 changed files with 10 additions and 23 deletions

4
env/sata.c vendored
View File

@ -113,9 +113,7 @@ static void env_sata_load(void)
return -EIO;
}
env_import(buf, 1);
return 0;
return env_import(buf, 1);
}
U_BOOT_ENV_LOCATION(sata) = {