summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2011-12-17 13:58:16 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-01-09 18:20:58 +0000
commit327c62c554a78af399938445094a7dc834b7fd0b (patch)
treece9a731c807cbb379615a04079e1ed7e73746d8c
parent678eb9bb8114c47a7b89fd1288ff5dc760c53c1c (diff)
downloadlinux-stable-327c62c554a78af399938445094a7dc834b7fd0b.tar.gz
linux-stable-327c62c554a78af399938445094a7dc834b7fd0b.tar.bz2
linux-stable-327c62c554a78af399938445094a7dc834b7fd0b.zip
mtd: bcm63xxpart: don't assume NVRAM is always the fourth partition
Instead of referencing the sizes of fixed partitions, use the precomputed CFE/NVRAM lengths. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/bcm63xxpart.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c
index 17e137080a6b..6afc4aa3c622 100644
--- a/drivers/mtd/bcm63xxpart.c
+++ b/drivers/mtd/bcm63xxpart.c
@@ -165,8 +165,8 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
/* Global partition "linux" to make easy firmware upgrade */
curpart++;
parts[curpart].name = "linux";
- parts[curpart].offset = parts[0].size;
- parts[curpart].size = master->size - parts[0].size - parts[3].size;
+ parts[curpart].offset = cfelen;
+ parts[curpart].size = master->size - cfelen - nvramlen;
for (i = 0; i < nrparts; i++)
pr_info("Partition %d is %s offset %lx and length %lx\n", i,