diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-19 00:38:23 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-19 00:38:23 +0200 |
commit | a694610d3361465d4c8d27dde72ab8b63d31115e (patch) | |
tree | 063d03bcf75538fe45f940eda5b1e6f1859a96fb /drivers/mtd/nand/nand_util.c | |
parent | 5669ed4557edf2714203aa8625c9fcd5a753b338 (diff) | |
parent | 2419169f5749d7af501b3b77a5336d1d535320de (diff) | |
download | talos-obmc-uboot-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.gz talos-obmc-uboot-a694610d3361465d4c8d27dde72ab8b63d31115e.zip |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'drivers/mtd/nand/nand_util.c')
-rw-r--r-- | drivers/mtd/nand/nand_util.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index fc16282c2e..694ead68a1 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -567,10 +567,10 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, if (len_incl_bad == *length) { rval = nand_read (nand, offset, length, buffer); - if (rval != 0) - printf ("NAND read from offset %llx failed %d\n", - offset, rval); - + if (!rval || rval == -EUCLEAN) + return 0; + printf ("NAND read from offset %llx failed %d\n", + offset, rval); return rval; } @@ -591,7 +591,7 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, read_length = nand->erasesize - block_offset; rval = nand_read (nand, offset, &read_length, p_buffer); - if (rval != 0) { + if (rval && rval != -EUCLEAN) { printf ("NAND read from offset %llx failed %d\n", offset, rval); *length -= left_to_read; |