X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm-2.4%2Fpatches%2F004-flash.patch;h=de2d5b170f3df0cd1453c9b30ec1da01c4f25700;hb=6e52da3bc7920c458309c487218fbfdc75fc0ef7;hp=4fbf3da7e9ff8d218e5f44760b4353506aea16c2;hpb=5730eb7752a985301185abf4e091022eea2c7119;p=openwrt-10.03%2F.git

diff --git a/target/linux/brcm-2.4/patches/004-flash.patch b/target/linux/brcm-2.4/patches/004-flash.patch
index 4fbf3da7e..de2d5b170 100644
--- a/target/linux/brcm-2.4/patches/004-flash.patch
+++ b/target/linux/brcm-2.4/patches/004-flash.patch
@@ -334,10 +334,11 @@ 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,544 @@
+@@ -0,0 +1,548 @@
 +/*
-+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
++ *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
 + *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
++ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
 + *
 + *  original functions for finding root filesystem from Mike Baker 
 + *
@@ -663,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);
 +
@@ -717,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;