ar71xx: refresh patches

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34186
owl
Gabor Juhos 2012-11-13 14:47:58 +00:00
parent 3b419e506c
commit ce9d4fadfa
2 changed files with 7 additions and 7 deletions

View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c --- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c
@@ -79,6 +79,11 @@ static int parse_redboot_partitions(stru @@ -76,6 +76,11 @@ static int parse_redboot_partitions(stru
static char nullstring[] = "unallocated"; static char nullstring[] = "unallocated";
#endif #endif
@ -12,7 +12,7 @@
if ( directory < 0 ) { if ( directory < 0 ) {
offset = master->size + directory * master->erasesize; offset = master->size + directory * master->erasesize;
while (mtd_can_have_bb(master) && while (mtd_can_have_bb(master) &&
@@ -86,6 +91,7 @@ static int parse_redboot_partitions(stru @@ -83,6 +88,7 @@ static int parse_redboot_partitions(stru
if (!offset) { if (!offset) {
nogood: nogood:
printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n"); printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
@ -20,7 +20,7 @@
return -EIO; return -EIO;
} }
offset -= master->erasesize; offset -= master->erasesize;
@@ -99,10 +105,6 @@ static int parse_redboot_partitions(stru @@ -96,10 +102,6 @@ static int parse_redboot_partitions(stru
goto nogood; goto nogood;
} }
} }
@ -31,7 +31,7 @@
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
master->name, offset); master->name, offset);
@@ -175,6 +177,11 @@ static int parse_redboot_partitions(stru @@ -172,6 +174,11 @@ static int parse_redboot_partitions(stru
} }
if (i == numslots) { if (i == numslots) {
/* Didn't find it */ /* Didn't find it */

View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c --- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c
@@ -79,12 +79,18 @@ static int parse_redboot_partitions(stru @@ -76,12 +76,18 @@ static int parse_redboot_partitions(stru
static char nullstring[] = "unallocated"; static char nullstring[] = "unallocated";
#endif #endif
@ -19,7 +19,7 @@
return -EIO; return -EIO;
} }
offset -= master->erasesize; offset -= master->erasesize;
@@ -97,10 +103,6 @@ static int parse_redboot_partitions(stru @@ -94,10 +100,6 @@ static int parse_redboot_partitions(stru
goto nogood; goto nogood;
} }
} }
@ -30,7 +30,7 @@
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n", printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
master->name, offset); master->name, offset);
@@ -173,6 +175,11 @@ static int parse_redboot_partitions(stru @@ -170,6 +172,11 @@ static int parse_redboot_partitions(stru
} }
if (i == numslots) { if (i == numslots) {
/* Didn't find it */ /* Didn't find it */