34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From fd2ab39f22af4176eb3d23acbc4d1218cf835065 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
||
|
|
Date: Tue, 8 May 2012 09:47:32 +0200
|
||
|
|
Subject: [PATCH 21/79] MTD: bcm63xxpart: merge sparelen calculation
|
||
|
|
|
||
|
|
The length of the spare part is calculated the same way in both branches
|
||
|
|
so move to a common place.
|
||
|
|
|
||
|
|
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
||
|
|
---
|
||
|
|
drivers/mtd/bcm63xxpart.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/mtd/bcm63xxpart.c
|
||
|
|
+++ b/drivers/mtd/bcm63xxpart.c
|
||
|
|
@@ -120,7 +120,6 @@ static int bcm63xx_parse_cfe_partitions(
|
||
|
|
kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
|
||
|
|
rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE;
|
||
|
|
spareaddr = roundup(totallen, master->erasesize) + cfelen;
|
||
|
|
- sparelen = master->size - spareaddr - nvramlen;
|
||
|
|
|
||
|
|
if (rootfsaddr < kerneladdr) {
|
||
|
|
/* default Broadcom layout */
|
||
|
|
@@ -138,8 +137,8 @@ static int bcm63xx_parse_cfe_partitions(
|
||
|
|
rootfslen = 0;
|
||
|
|
rootfsaddr = 0;
|
||
|
|
spareaddr = cfelen;
|
||
|
|
- sparelen = master->size - cfelen - nvramlen;
|
||
|
|
}
|
||
|
|
+ sparelen = master->size - spareaddr - nvramlen;
|
||
|
|
|
||
|
|
/* Determine number of partitions */
|
||
|
|
if (rootfslen > 0)
|