[PATCH] mtd: bcm47xxpart: only register partitions if the trx header was filled
Hauke Mehrtens
hauke at hauke-m.de
Sun Sep 21 15:33:13 PDT 2014
Sometimes the trx offsets are 0, in that case there is no partition and
we should not try to add one.
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
drivers/mtd/bcm47xxpart.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 8057f52..c3f4454 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -168,18 +168,22 @@ static int bcm47xxpart_parse(struct mtd_info *master,
i++;
}
- bcm47xxpart_add_part(&parts[curr_part++], "linux",
- offset + trx->offset[i], 0);
- i++;
+ if (trx->offset[i]) {
+ bcm47xxpart_add_part(&parts[curr_part++], "linux",
+ offset + trx->offset[i], 0);
+ i++;
+ }
/*
* Pure rootfs size is known and can be calculated as:
* trx->length - trx->offset[i]. We don't fill it as
* we want to have jffs2 (overlay) in the same mtd.
*/
- bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
- offset + trx->offset[i], 0);
- i++;
+ if (trx->offset[i]) {
+ bcm47xxpart_add_part(&parts[curr_part++], "rootfs",
+ offset + trx->offset[i], 0);
+ i++;
+ }
last_trx_part = curr_part - 1;
--
1.9.1
More information about the linux-mtd
mailing list