summaryrefslogtreecommitdiff
path: root/env/sf.c
diff options
context:
space:
mode:
authorSimon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>2018-01-31 14:47:10 +0100
committerTom Rini <trini@konsulko.com>2018-01-31 18:45:10 -0500
commit42a1820bbcc7dfedcf625b88a1013c11e9ef6709 (patch)
tree5ad1234769e5fd1f4745399a544115b1d7d3130b /env/sf.c
parent87c7fb396a59d3e2be434cc956462ba46451193b (diff)
downloadu-boot-42a1820bbcc7dfedcf625b88a1013c11e9ef6709.tar.gz
u-boot-42a1820bbcc7dfedcf625b88a1013c11e9ef6709.tar.bz2
u-boot-42a1820bbcc7dfedcf625b88a1013c11e9ef6709.zip
env: make env_import(_redund) return 0 on success, not 1
env_import (and env_import_redund) currently return 1 on success and 0 on error. However, they are only used from functions returning 0 on success or a negative value on error. Let's clean this up by making env_import and env_import_redund return 0 on success and -EIO on error (as was the case for all users before). Users that cared for the return value are also updated. Funny enough, this only affects onenand.c and sf.c Signed-off-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'env/sf.c')
-rw-r--r--env/sf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/env/sf.c b/env/sf.c
index a2e4c93631..3dc54410df 100644
--- a/env/sf.c
+++ b/env/sf.c
@@ -236,7 +236,7 @@ static int env_sf_load(void)
ep = tmp_env2;
ret = env_import((char *)ep, 0);
- if (!ret) {
+ if (ret) {
pr_err("Cannot import environment: errno = %d\n", errno);
set_default_env("!env_import failed");
}
@@ -336,7 +336,7 @@ static int env_sf_load(void)
}
ret = env_import(buf, 1);
- if (ret)
+ if (!ret)
gd->env_valid = ENV_VALID;
err_read: