target/linux/brcm63xx/patches-3.6/102-MTD-bcm63xxpart-merge-sparelen-calculation.patch

   1 From fd2ab39f22af4176eb3d23acbc4d1218cf835065 Mon Sep 17 00:00:00 2001
   2 From: Jonas Gorski <jonas.gorski@gmail.com>
   3 Date: Tue, 8 May 2012 09:47:32 +0200
   4 Subject: [PATCH 21/79] MTD: bcm63xxpart: merge sparelen calculation
   5
   6 The length of the spare part is calculated the same way in both branches
   7 so move to a common place.
   8
   9 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  10 ---
  11  drivers/mtd/bcm63xxpart.c |    3 +--
  12  1 file changed, 1 insertion(+), 2 deletions(-)
  13
  14 --- a/drivers/mtd/bcm63xxpart.c
  15 +++ b/drivers/mtd/bcm63xxpart.c
  16 @@ -120,7 +120,6 @@ static int bcm63xx_parse_cfe_partitions(
  17                 kerneladdr = kerneladdr - BCM63XX_EXTENDED_SIZE;
  18                 rootfsaddr = rootfsaddr - BCM63XX_EXTENDED_SIZE;
  19                 spareaddr = roundup(totallen, master->erasesize) + cfelen;
  20 -               sparelen = master->size - spareaddr - nvramlen;
  21
  22                 if (rootfsaddr < kerneladdr) {
  23                         /* default Broadcom layout */
  24 @@ -138,8 +137,8 @@ static int bcm63xx_parse_cfe_partitions(
  25                 rootfslen = 0;
  26                 rootfsaddr = 0;
  27                 spareaddr = cfelen;
  28 -               sparelen = master->size - cfelen - nvramlen;
  29         }
  30 +       sparelen = master->size - spareaddr - nvramlen;
  31
  32         /* Determine number of partitions */
  33         if (rootfslen > 0)