diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-16 23:00:53 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-16 23:00:53 +0100 |
| commit | 006915fbb0e3c1c9927fe32c4e92cb011f8499e7 (patch) | |
| tree | b477df920f7d638a0472aa1d6bfa5ff71243448c /common/env_nand.c | |
| parent | 98e69567022eb2138dd99554b3a2e80522a1b153 (diff) | |
| parent | b5d58d8500bfb918c7fec56f241e6ee1078c2be0 (diff) | |
| download | olio-uboot-2014.01-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.tar.xz olio-uboot-2014.01-006915fbb0e3c1c9927fe32c4e92cb011f8499e7.zip | |
Merge branch 'master' of ../master into next
Diffstat (limited to 'common/env_nand.c')
| -rw-r--r-- | common/env_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/env_nand.c b/common/env_nand.c index 4e8307aa3..7f6c91751 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -297,7 +297,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; |