git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6516 3c298f89-4303-0410-b956-a3cf2f4a3e73

[openwrt.git] / target / linux / brcm-2.4 / patches / 004-flash.patch

diff --git a/target/linux/brcm-2.4/patches/004-flash.patch b/target/linux/brcm-2.4/patches/004-flash.patch
index 7a07012..de2d5b1 100644 (file)
--- a/target/linux/brcm-2.4/patches/004-flash.patch
+++ b/target/linux/brcm-2.4/patches/004-flash.patch
@@ -334,7 +334,7 @@ diff -urN linux.old/drivers/mtd/devices/sflash.c linux.dev/drivers/mtd/devices/s
 diff -urN linux.old/drivers/mtd/maps/bcm947xx-flash.c linux.dev/drivers/mtd/maps/bcm947xx-flash.c
 --- linux.old/drivers/mtd/maps/bcm947xx-flash.c        1970-01-01 01:00:00.000000000 +0100
 +++ linux.dev/drivers/mtd/maps/bcm947xx-flash.c        2006-06-23 18:08:46.000000000 +0200
-@@ -0,0 +1,545 @@
+@@ -0,0 +1,548 @@
 +/*
 + *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
 + *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
@@ -664,8 +664,10 @@ diff -urN linux.old/drivers/mtd/maps/bcm947xx-flash.c linux.dev/drivers/mtd/maps
 +
 +              /* Update the squashfs partition size based on the superblock info */
 +              part->size = sb->bytes_used;
-+              part->size +=  (mtd->erasesize - 1);
-+              part->size &= ~(mtd->erasesize - 1);
++              len = part->offset + part->size;
++              len +=  (mtd->erasesize - 1);
++              len &= ~(mtd->erasesize - 1);
++              part->size = len - part->offset;
 +      } else if (*((__u16 *) buf) == JFFS2_MAGIC_BITMASK) {
 +              printk(KERN_INFO "%s: Filesystem type: jffs2\n", mtd->name);
 +
@@ -718,7 +720,8 @@ diff -urN linux.old/drivers/mtd/maps/bcm947xx-flash.c linux.dev/drivers/mtd/maps
 +{
 +      int cfe_size;
 +
-+      cfe_size = find_cfe_size(mtd,size);
++      if ((cfe_size = find_cfe_size(mtd,size)) < 0)
++              return NULL;
 +
 +      /* boot loader */
 +      bcm947xx_parts[0].offset = 0;