aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-04 08:07:39 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-05-04 08:07:39 +0000
commitf89ff525ee19752a376d00c343cfd038d22bb797 (patch)
tree033bc2f5e13b7c80a9ecf4b9bfbfa4e12532833c
parent34ad2a0b71ab9e6e67199fb0cc4a859b66e7f821 (diff)
downloadupstream-f89ff525ee19752a376d00c343cfd038d22bb797.tar.gz
upstream-f89ff525ee19752a376d00c343cfd038d22bb797.tar.bz2
upstream-f89ff525ee19752a376d00c343cfd038d22bb797.zip
revert r21085, fixes #7282
SVN-Revision: 21352
-rw-r--r--target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch2
2 files changed, 2 insertions, 2 deletions
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 4784de7d6a..812e008a21 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 6edb8c7873..5f3e0a2734 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;