diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-10-28 21:57:02 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-28 21:57:02 -0400 |
commit | 3c441baa0365ea7c3be9ee79f03e944289dd37e1 (patch) | |
tree | ac030573837c8df6086acec92e9d72814c19a4cd /drivers | |
parent | 9c37f3329ae098d4c17e8bec589a589bcbf0acff (diff) | |
download | op-kernel-dev-3c441baa0365ea7c3be9ee79f03e944289dd37e1.zip op-kernel-dev-3c441baa0365ea7c3be9ee79f03e944289dd37e1.tar.gz |
[MTD] Skip bad blocks when checking for RedBoot partition table
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/redboot.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c index a61351f..4747490 100644 --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c @@ -59,16 +59,31 @@ static int parse_redboot_partitions(struct mtd_info *master, static char nullstring[] = "unallocated"; #endif + if ( directory < 0 ) { + offset = master->size + directory * master->erasesize; + while (master->block_isbad && + master->block_isbad(master, offset)) { + if (!offset) { + nogood: + printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n"); + return -EIO; + } + offset -= master->erasesize; + } + } else { + offset = directory * master->erasesize; + while (master->block_isbad && + master->block_isbad(master, offset)) { + offset += master->erasesize; + if (offset == master->size) + goto nogood; + } + } buf = vmalloc(master->erasesize); if (!buf) return -ENOMEM; - if ( directory < 0 ) - offset = master->size + directory*master->erasesize; - else - offset = directory*master->erasesize; - printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", master->name, offset); |