summaryrefslogtreecommitdiff
path: root/target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-08-04 20:54:49 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-08-04 20:54:49 +0000
commit5b9d4fd80a2b8a493c3494269f382ca79a12c126 (patch)
tree2041996473da887b574786b03686bf997cc62b79 /target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch
parent005f8ed56316490be357d119fadf0d2183fce31a (diff)
downloadmtk-20170518-5b9d4fd80a2b8a493c3494269f382ca79a12c126.zip
mtk-20170518-5b9d4fd80a2b8a493c3494269f382ca79a12c126.tar.gz
mtk-20170518-5b9d4fd80a2b8a493c3494269f382ca79a12c126.tar.bz2
atheros: copy 3.10 patches to 3.14 and refresh them
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> SVN-Revision: 41995
Diffstat (limited to 'target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch')
-rw-r--r--target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch b/target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch
new file mode 100644
index 0000000..d1d281e
--- /dev/null
+++ b/target/linux/atheros/patches-3.14/141-redboot_partition_scan.patch
@@ -0,0 +1,44 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -79,12 +79,18 @@ 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_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;
+@@ -97,10 +103,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);
+@@ -173,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;