summaryrefslogtreecommitdiffstats
path: root/common/env_nand.c
diff options
context:
space:
mode:
authorH. Nikolaus Schaller <hns@goldelico.com>2010-12-18 10:52:16 +0100
committerH. Nikolaus Schaller <hns@goldelico.com>2010-12-18 10:52:16 +0100
commit6ab09204eafeee39d3afe6d1cc45c984e1b7b8dc (patch)
treec73cb1afaaaac2dd90c8b000f7ec0e0b178df0de /common/env_nand.c
parent8e599f4652423e4db991e99f9c5adf75f0163e0e (diff)
parent73c65e0e77cb5005cc4fa2c0cb435f1dffb90a71 (diff)
downloadbootable_bootloader_goldelico_gta04-6ab09204eafeee39d3afe6d1cc45c984e1b7b8dc.zip
bootable_bootloader_goldelico_gta04-6ab09204eafeee39d3afe6d1cc45c984e1b7b8dc.tar.gz
bootable_bootloader_goldelico_gta04-6ab09204eafeee39d3afe6d1cc45c984e1b7b8dc.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot into gta04e
Diffstat (limited to 'common/env_nand.c')
-rw-r--r--common/env_nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/env_nand.c b/common/env_nand.c
index 345d2db..dddd7c1 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -301,7 +301,7 @@ int readenv(size_t offset, u_char * buf)
offset += blocksize;
} else {
char_ptr = &buf[amount_loaded];
- if (nand_read(&nand_info[0], offset, &len, char_ptr))
+ if (nand_read_skip_bad(&nand_info[0], offset, &len, char_ptr))
return 1;
offset += blocksize;
amount_loaded += len;