From 77b5c8f25addff27287cddbcc94e51fb6126709a Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 12 Nov 2012 10:52:48 +0100 Subject: [PATCH] --- yaml --- r: 347185 b: refs/heads/master c: e190401ba1ca20d76f22c1f0aada0abd5bdc1afe h: refs/heads/master i: 347183: 0d20b43babd3dac3145dbfd2e12c5689896b550c v: v3 --- [refs] | 2 +- trunk/drivers/mtd/bcm63xxpart.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0cada6cc151c..b7850da01de3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fafc3d6880b28fe55af935fd43b23a29d61c537d +refs/heads/master: e190401ba1ca20d76f22c1f0aada0abd5bdc1afe diff --git a/trunk/drivers/mtd/bcm63xxpart.c b/trunk/drivers/mtd/bcm63xxpart.c index 1eb1416404a6..ba7eeb874b31 100644 --- a/trunk/drivers/mtd/bcm63xxpart.c +++ b/trunk/drivers/mtd/bcm63xxpart.c @@ -120,7 +120,6 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, 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(struct mtd_info *master, rootfslen = 0; rootfsaddr = 0; spareaddr = cfelen; - sparelen = master->size - cfelen - nvramlen; } + sparelen = master->size - spareaddr - nvramlen; /* Determine number of partitions */ if (rootfslen > 0)