mtd: bcm47xxpart: only register partitions if the trx header was filled

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=a1ff7d64c5361c15bac653708a679de13506d283
Commit:     a1ff7d64c5361c15bac653708a679de13506d283
Parent:     b85b8d92c1d720a5b2229aa1bad9bd77f09b8ec5
Author:     Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Mon Sep 22 00:33:13 2014 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Oct 22 02:04:34 2014 -0700

    mtd: bcm47xxpart: only register partitions if the trx header was filled
    
    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>
    [Brian: rewrapped]
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/bcm47xxpart.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index f2db4d7..cc13ea5 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -172,18 +172,26 @@ 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;