diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 12:22:17 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-16 08:31:24 -0400 |
| commit | c5951991942330c129f3b181e94969d7c01e9abb (patch) | |
| tree | 39b5ee4ee37e5a595e088456e792d7251f7ee1ca /env/sata.c | |
| parent | 21f639446d6bccb6cc550140d36bd3ebd74fcee8 (diff) | |
env: Adjust the load() method to return an error
The load() methods have inconsistent behaviour on error. Some of them load
an empty default environment. Some load an environment containing an error
message. Others do nothing.
As a step in the right direction, have the method return an error code.
Then the caller could handle this itself in a consistent way.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'env/sata.c')
| -rw-r--r-- | env/sata.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/env/sata.c b/env/sata.c index 16d8f939db..a77029774e 100644 --- a/env/sata.c +++ b/env/sata.c @@ -98,21 +98,24 @@ static void env_sata_load(void) int env_sata; if (sata_initialize()) - return; + return -EIO; env_sata = sata_get_env_dev(); sata = sata_get_dev(env_sata); if (sata == NULL) { - printf("Unknown SATA(%d) device for environment!\n", - env_sata); - return; + printf("Unknown SATA(%d) device for environment!\n", env_sata); + return -EIO; } - if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) - return set_default_env(NULL); + if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) { + set_default_env(NULL); + return -EIO; + } env_import(buf, 1); + + return 0; } U_BOOT_ENV_LOCATION(sata) = { |