---

yaml --- r: 360371 b: refs/heads/master c: 25bad1d h: refs/heads/master i: 360369: 74dd018 360367: de2204e v: v3
git-mirror · Feb 4, 2013 · 420cb2c · 420cb2c
1 parent 531c236
commit 420cb2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7bf6543e842e164ec00eb53863d0454200c59d4
+refs/heads/master: 25bad1d3c9f5616aaa50849300248d03141574a0
diff --git a/trunk/drivers/mtd/bcm47xxpart.c b/trunk/drivers/mtd/bcm47xxpart.c
@@ -59,11 +59,14 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 	uint32_t *buf;
 	size_t bytes_read;
 	uint32_t offset;
-	uint32_t blocksize = 0x10000;
+	uint32_t blocksize = master->erasesize;
 	struct trx_header *trx;
 	int trx_part = -1;
 	int last_trx_part = -1;
 
+	if (blocksize <= 0x10000)
+		blocksize = 0x10000;
+
 	/* Alloc */
 	parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS,
 			GFP_KERNEL);