1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-22 15:06:46 +02:00
openwrt-xburst/target/linux/atheros/patches-2.6.38/140-redboot_partition_scan.patch
acoul 98a395304f linux/atheros: add 2.6.38 preliminary support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26772 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-27 17:18:03 +00:00

55 lines
1.5 KiB
Diff

--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -78,31 +78,32 @@ static int parse_redboot_partitions(stru
static char nullstring[] = "unallocated";
#endif
+ buf = vmalloc(master->erasesize);
+ if (!buf)
+ return -ENOMEM;
+
+ restart:
if ( directory < 0 ) {
offset = master->size + directory * master->erasesize;
- while (master->block_isbad &&
+ 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");
+ vfree(buf);
return -EIO;
}
offset -= master->erasesize;
}
} else {
offset = directory * master->erasesize;
- while (master->block_isbad &&
+ 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;
-
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
master->name, offset);
@@ -174,6 +175,11 @@ static int parse_redboot_partitions(stru
}
if (i == numslots) {
/* Didn't find it */
+ if (offset + master->erasesize < master->size) {
+ /* not at the end of the flash yet, maybe next block :) */
+ directory++;
+ goto restart;
+ }
printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
master->name);
ret = 0;