diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-11 09:38:21 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-11 09:38:21 -0500 |
| commit | 8fa7a41f65956ac3b6653dc6274c5111c99093ff (patch) | |
| tree | 74df1808d8d9ee47f4ffc90df0300b4e655e79ae /drivers/mtd/onenand/onenand_bbt.c | |
| parent | abb536e7ac8719243cfc4b40b39bf3eefd028f82 (diff) | |
| parent | 0fc2ccea4c8fa779053cb6f8984f6da399a81182 (diff) | |
Merge branch 'master' of git://git.infradead.org/~kmpark/onenand-mtd-2.6
Diffstat (limited to 'drivers/mtd/onenand/onenand_bbt.c')
| -rw-r--r-- | drivers/mtd/onenand/onenand_bbt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index 6cceeca40567..98f8fd1c6375 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c | |||
| @@ -93,7 +93,8 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr | |||
| 93 | ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs, | 93 | ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs, |
| 94 | readlen, &retlen, &buf[0]); | 94 | readlen, &retlen, &buf[0]); |
| 95 | 95 | ||
| 96 | if (ret) | 96 | /* If it is a initial bad block, just ignore it */ |
| 97 | if (ret && !(ret & ONENAND_CTRL_LOAD)) | ||
| 97 | return ret; | 98 | return ret; |
| 98 | 99 | ||
| 99 | if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) { | 100 | if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) { |