generic/4.1: refresh patches

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 47821
owl
Imre Kaloz 2015-12-10 12:14:19 +00:00
parent 4707123fca
commit f5ff684147
2 changed files with 6 additions and 11 deletions

View File

@ -20,7 +20,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/drivers/mtd/bcm47xxpart.c --- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c
@@ -118,8 +118,8 @@ static int bcm47xxpart_parse(struct mtd_info *master, @@ -118,8 +118,8 @@ static int bcm47xxpart_parse(struct mtd_
/* Parse block by block looking for magics */ /* Parse block by block looking for magics */
for (offset = 0; offset <= master->size - blocksize; for (offset = 0; offset <= master->size - blocksize;
offset += blocksize) { offset += blocksize) {

View File

@ -14,11 +14,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/mtd/bcm47xxpart.c | 38 ++++++++++++++++++++++---------------- drivers/mtd/bcm47xxpart.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-) 1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 4450e74..1ab3451 100644
--- a/drivers/mtd/bcm47xxpart.c --- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c
@@ -66,11 +66,13 @@ static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master, @@ -66,11 +66,13 @@ static const char *bcm47xxpart_trx_data_
{ {
uint32_t buf; uint32_t buf;
size_t bytes_read; size_t bytes_read;
@ -36,7 +34,7 @@ index 4450e74..1ab3451 100644
goto out_default; goto out_default;
} }
@@ -95,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_info *master, @@ -95,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_
int trx_part = -1; int trx_part = -1;
int last_trx_part = -1; int last_trx_part = -1;
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
@ -44,7 +42,7 @@ index 4450e74..1ab3451 100644
/* /*
* Some really old flashes (like AT45DB*) had smaller erasesize-s, but * Some really old flashes (like AT45DB*) had smaller erasesize-s, but
@@ -128,10 +131,11 @@ static int bcm47xxpart_parse(struct mtd_info *master, @@ -128,10 +131,11 @@ static int bcm47xxpart_parse(struct mtd_
} }
/* Read beginning of the block */ /* Read beginning of the block */
@ -60,7 +58,7 @@ index 4450e74..1ab3451 100644
continue; continue;
} }
@@ -254,10 +258,11 @@ static int bcm47xxpart_parse(struct mtd_info *master, @@ -254,10 +258,11 @@ static int bcm47xxpart_parse(struct mtd_
} }
/* Read middle of the block */ /* Read middle of the block */
@ -76,7 +74,7 @@ index 4450e74..1ab3451 100644
continue; continue;
} }
@@ -277,10 +282,11 @@ static int bcm47xxpart_parse(struct mtd_info *master, @@ -277,10 +282,11 @@ static int bcm47xxpart_parse(struct mtd_
} }
offset = master->size - possible_nvram_sizes[i]; offset = master->size - possible_nvram_sizes[i];
@ -92,6 +90,3 @@ index 4450e74..1ab3451 100644
continue; continue;
} }
--
1.8.4.5