summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDaniel Hobi <daniel.hobi@schmid-telecom.ch>2009-12-01 14:05:55 +0100
committerWolfgang Denk <wd@denx.de>2009-12-07 22:38:16 +0100
commit0ec81db20294efdad2454a753e79f1fe244a43ca (patch)
tree865172014f4b0dff001d4f7dfedf52cfef27f80e /drivers
parentaabb8cb0818e285aeed0cfaf243635997e07554d (diff)
downloadu-boot-imx-0ec81db20294efdad2454a753e79f1fe244a43ca.zip
u-boot-imx-0ec81db20294efdad2454a753e79f1fe244a43ca.tar.gz
u-boot-imx-0ec81db20294efdad2454a753e79f1fe244a43ca.tar.bz2
Fix computation in nand_util.c:get_len_incl_bad
Depending on offset, flash size and the number of bad blocks, get_len_incl_bad may return a too small value which may lead to: 1) If there are no bad blocks, nand_{read,write}_skip_bad chooses the bad block aware read/write code. This may hurt performance, but does not have any adverse effects. 2) If there are bad blocks, the nand_{read,write}_skip_bad may choose the bad block unaware read/write code (if len_incl_bad == *length) which leads to corrupted data. Signed-off-by: Daniel Hobi <daniel.hobi@schmid-telecom.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/nand_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index bec9277..7085d42 100644
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -452,7 +452,7 @@ static size_t get_len_incl_bad (nand_info_t *nand, loff_t offset,
len_incl_bad += block_len;
offset += block_len;
- if ((offset + len_incl_bad) >= nand->size)
+ if (offset >= nand->size)
break;
}