diff options
author | Matteo Croce <matteo@openwrt.org> | 2010-02-28 16:33:15 +0000 |
---|---|---|
committer | Matteo Croce <matteo@openwrt.org> | 2010-02-28 16:33:15 +0000 |
commit | 9b4562192780ff4156a41247be8c00f7e9ba447e (patch) | |
tree | b1fce4764cf4bc0677171983ad42622ea71a4037 /target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch | |
parent | d906c0fa8bbdad2027e25e4545ba3de0428d014c (diff) | |
download | master-187ad058-9b4562192780ff4156a41247be8c00f7e9ba447e.tar.gz master-187ad058-9b4562192780ff4156a41247be8c00f7e9ba447e.tar.bz2 master-187ad058-9b4562192780ff4156a41247be8c00f7e9ba447e.zip |
ar71xx: 2.6.33 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19908 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch')
-rw-r--r-- | target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch new file mode 100644 index 0000000000..289d4eb990 --- /dev/null +++ b/target/linux/ar71xx/patches-2.6.33/140-redboot_partition_scan.patch @@ -0,0 +1,54 @@ +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c +@@ -60,31 +60,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); + +@@ -156,6 +157,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; |