From 086cdeceebb6f2a68cf163b318373eab26ed9728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Sun, 6 Jan 2013 16:08:35 +0100
Subject: [PATCH] --- yaml --- r: 360351 b: refs/heads/master c:
 648bdbee5d2cc3ff27370d05e7577ade8496bfd0 h: refs/heads/master i:   360349:
 8c448f2eba39da4afd2c82d33258a878fcb337c8   360347:
 15602a9844ce98250f5699da97d8414f1e1deb31   360343:
 49e492188dbdc565bcbfa2c6876a1e7e2ae0746b   360335:
 c543b2cbe00fc43211f2ad5a0a0998522c6793d0   360319:
 0e137718f537d00c505f76efa40afc3471dfd8ff v: v3

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

diff --git a/[refs] b/[refs]
index 3da2ff39280c..d968164d9ad0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55bf75b7dd8ec875d048824f3cdecf8254e292e5
+refs/heads/master: 648bdbee5d2cc3ff27370d05e7577ade8496bfd0
diff --git a/trunk/drivers/mtd/bcm47xxpart.c b/trunk/drivers/mtd/bcm47xxpart.c
index e06d782489a6..06125eb59f14 100644
--- a/trunk/drivers/mtd/bcm47xxpart.c
+++ b/trunk/drivers/mtd/bcm47xxpart.c
@@ -169,11 +169,12 @@ static int bcm47xxpart_parse(struct mtd_info *master,
 	 * Assume that partitions end at the beginning of the one they are
 	 * followed by.
 	 */
-	for (i = 0; i < curr_part - 1; i++)
-		parts[i].size = parts[i + 1].offset - parts[i].offset;
-	if (curr_part > 0)
-		parts[curr_part - 1].size =
-				master->size - parts[curr_part - 1].offset;
+	for (i = 0; i < curr_part; i++) {
+		u64 next_part_offset = (i < curr_part - 1) ?
+				       parts[i + 1].offset : master->size;
+
+		parts[i].size = next_part_offset - parts[i].offset;
+	}
 
 	*pparts = parts;
 	return curr_part;