commit b4770a5224d3216c4e40ecbf15804859271f2436
author Wolfgang Denk <wd@denx.de> Sat Nov 13 00:38:08 2010 +0100
committer Wolfgang Denk <wd@denx.de> Sat Nov 13 00:38:08 2010 +0100
tree 931e442f15db867bf797c935d11f7d7affd9a78c
parent be25083394ad1d1206f9db5b0181296a768f6595
parent 4b7594c308cbf07d50e80d345116bd9fe48df3bd

Merge branch 'master' of /home/wd/git/u-boot/custodians

common/env_sf.c

diff --git a/common/env_sf.c b/common/env_sf.c
index a597b24..47c6a70 100644
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -272,7 +272,7 @@
 	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 @@
 		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,