From 2166ebf7831674508425daf50c78e481083c6462 Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Wed, 31 Jan 2018 14:47:12 +0100 Subject: 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 Acked-by: Maxime Ripard --- env/eeprom.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'env/eeprom.c') diff --git a/env/eeprom.c b/env/eeprom.c index 584379ebd26..55d19d9d99c 100644 --- a/env/eeprom.c +++ b/env/eeprom.c @@ -181,9 +181,7 @@ static int env_eeprom_load(void) eeprom_bus_read(CONFIG_SYS_DEF_EEPROM_ADDR, off, (uchar *)buf_env, CONFIG_ENV_SIZE); - env_import(buf_env, 1); - - return 0; + return env_import(buf_env, 1); } static int env_eeprom_save(void) -- cgit v1.2.3