diff mbox series

[v2,for-4.9,17/32] mtd: bcm47xxpart: fix parsing first block after aligned TRX

Message ID 1491388344-13521-18-git-send-email-amit.pundir@linaro.org
State New
Headers show
Series Stable commits picked up from lede project | expand

Commit Message

Amit Pundir April 5, 2017, 10:32 a.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>


After parsing TRX we should skip to the first block placed behind it.
Our code was working only with TRX with length not aligned to the
blocksize. In other cases (length aligned) it was missing the block
places right after TRX.

This fixes calculation and simplifies the comment.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

Signed-off-by: Brian Norris <computersforpeace@gmail.com>

(cherry picked from commit bd5d21310133921021d78995ad6346f908483124)
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

---
 drivers/mtd/bcm47xxpart.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

-- 
2.7.4
diff mbox series

Patch

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 3779475..283ff7e 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -229,12 +229,10 @@  static int bcm47xxpart_parse(struct mtd_info *master,
 
 			last_trx_part = curr_part - 1;
 
-			/*
-			 * We have whole TRX scanned, skip to the next part. Use
-			 * roundown (not roundup), as the loop will increase
-			 * offset in next step.
-			 */
-			offset = rounddown(offset + trx->length, blocksize);
+			/* Jump to the end of TRX */
+			offset = roundup(offset + trx->length, blocksize);
+			/* Next loop iteration will increase the offset */
+			offset -= blocksize;
 			continue;
 		}