projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
4b7594c
)
Merge branch 'master' of /home/wd/git/u-boot/custodians
author
Wolfgang Denk
<wd@denx.de>
Fri, 12 Nov 2010 23:38:08 +0000
(
00:38
+0100)
committer
Wolfgang Denk
<wd@denx.de>
Fri, 12 Nov 2010 23:38:08 +0000
(
00:38
+0100)
common/env_sf.c
patch
|
blob
|
history
diff --git
a/common/env_sf.c
b/common/env_sf.c
index
a597b24
..
47c6a70
100644
(file)
--- a/
common/env_sf.c
+++ b/
common/env_sf.c
@@
-272,7
+272,7
@@
int saveenv(void)
u32 saved_size, saved_offset;
char *saved_buffer = NULL;
u32 sector = 1;
- int ret;
+ int ret
= 1
;
env_t env_new;
char *res;
ssize_t len;
@@
-293,7
+293,6
@@
int saveenv(void)
saved_offset = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
saved_buffer = malloc(saved_size);
if (!saved_buffer) {
- ret = 1;
goto done;
}
ret = spi_flash_read(env_flash, saved_offset,