From: Rafał Miłecki Date: Mon, 8 Dec 2014 17:45:00 +0000 (+0100) Subject: mtd: bcm47xxpart: lower minimal blocksize to 4Ki (from 64Ki) X-Git-Tag: v4.0-rc1~50^2~40 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=16bd87b3a352b536ffdd7325e3178c4231f3cbf7;p=karo-tx-linux.git mtd: bcm47xxpart: lower minimal blocksize to 4Ki (from 64Ki) Some devices like Netgear WNR1000v3 or WGR614v10 have partitions aligned to 0x1000. Using bigger blocksize stopped us from detecting some parts. Signed-off-by: Rafał Miłecki Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 26a4a4a4e8ab..4ad392892b70 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -94,8 +94,12 @@ static int bcm47xxpart_parse(struct mtd_info *master, int last_trx_part = -1; int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; - if (blocksize <= 0x10000) - blocksize = 0x10000; + /* + * Some really old flashes (like AT45DB*) had smaller erasesize-s, but + * partitions were aligned to at least 0x1000 anyway. + */ + if (blocksize < 0x1000) + blocksize = 0x1000; /* Alloc */ parts = kzalloc(sizeof(struct mtd_partition) * BCM47XXPART_MAX_PARTS,