From 420cb2c6c8293528c6e01bcb1ffb6b0da801a38c Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu, 24 Jan 2013 17:39:58 +0100
Subject: [PATCH] --- yaml --- r: 360371 b: refs/heads/master c:
 25bad1d3c9f5616aaa50849300248d03141574a0 h: refs/heads/master i:   360369:
 74dd0180bdfc64b4c82c035f54a380303b0644a7   360367:
 de2204e43b493abdd624430f6163186069803d0a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mtd/bcm47xxpart.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0397f7f6f5df..3abc2a7223e8 100644
--- 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
index 3411bc2a1482..986ab6ef3181 100644
--- 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);