From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 4 May 2010 08:07:39 +0000 (+0000)
Subject: revert r21085, fixes #7282
X-Git-Tag: reboot~19952
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f89ff525ee19752a376d00c343cfd038d22bb797;p=openwrt%2Fstaging%2Fblogic.git

revert r21085, fixes #7282

SVN-Revision: 21352
---

diff --git a/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch
index 4784de7d6a0b..812e008a217f 100644
--- a/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch
@@ -140,7 +140,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
 +		return -ENOMEM;
 +
 +	/* Get the tag */
-+	ret = master->read(master,0x10000,sizeof(struct bcm_tag), &retlen, (void *)buf);
++	ret = master->read(master,master->erasesize,sizeof(struct bcm_tag), &retlen, (void *)buf);
 +	if (retlen != sizeof(struct bcm_tag)){
 +		vfree(buf);
 +		return -EIO;
diff --git a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
index 6edb8c7873ad..5f3e0a273429 100644
--- a/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch
@@ -140,7 +140,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
 +		return -ENOMEM;
 +
 +	/* Get the tag */
-+	ret = master->read(master,0x10000,sizeof(struct bcm_tag), &retlen, (void *)buf);
++	ret = master->read(master,mater->erasesize,sizeof(struct bcm_tag), &retlen, (void *)buf);
 +	if (retlen != sizeof(struct bcm_tag)){
 +		vfree(buf);
 +		return -EIO;