summaryrefslogtreecommitdiff
path: root/target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-06 17:08:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-06 17:08:30 +0000
commit9b20187ad5a2055bcabb3ee905afade92aaa3be2 (patch)
treeeb5307a5e2a7d77d4a5f2ff535c85b957990f047 /target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch
parent9a34f9d01e04ae80e1eba30deaf7fc8382d01706 (diff)
downloadmtk-20170518-9b20187ad5a2055bcabb3ee905afade92aaa3be2.zip
mtk-20170518-9b20187ad5a2055bcabb3ee905afade92aaa3be2.tar.gz
mtk-20170518-9b20187ad5a2055bcabb3ee905afade92aaa3be2.tar.bz2
atheros: update to 3.3.4 (based on work by acoul), fix mvswitch driver for newer kernels
SVN-Revision: 31625
Diffstat (limited to 'target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch')
-rw-r--r--target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch b/target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch
new file mode 100644
index 0000000..c83823a
--- /dev/null
+++ b/target/linux/atheros/patches-3.3/140-redboot_partition_scan.patch
@@ -0,0 +1,45 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -79,6 +79,11 @@ 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 (mtd_can_have_bb(master) &&
+@@ -86,6 +91,7 @@ static int parse_redboot_partitions(stru
+ 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;
+@@ -99,10 +105,6 @@ static int parse_redboot_partitions(stru
+ 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);
+@@ -175,6 +177,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;