diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-31 17:56:43 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-31 17:56:43 +0000 |
commit | 02940eda215fa7b0976a927299e62dfc57bb997b (patch) | |
tree | 8cc77d43fe9e73ba563e4a1385f39c9e46b4212f /target/linux/ar71xx/patches-2.6.30/140-redboot_partition_scan.patch | |
parent | 745f407bba660b1cb04aca30907672aa2f18ed29 (diff) | |
download | master-187ad058-02940eda215fa7b0976a927299e62dfc57bb997b.tar.gz master-187ad058-02940eda215fa7b0976a927299e62dfc57bb997b.tar.bz2 master-187ad058-02940eda215fa7b0976a927299e62dfc57bb997b.zip |
ar71xx: nuke 2.6.3[01] stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19467 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.30/140-redboot_partition_scan.patch')
-rw-r--r-- | target/linux/ar71xx/patches-2.6.30/140-redboot_partition_scan.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/target/linux/ar71xx/patches-2.6.30/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.30/140-redboot_partition_scan.patch deleted file mode 100644 index 289d4eb990..0000000000 --- a/target/linux/ar71xx/patches-2.6.30/140-redboot_partition_scan.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- 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; |