diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-05-04 08:07:39 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-05-04 08:07:39 +0000 |
| commit | bc4ae75a7d991f024b1b19f7e1ee070b62064c32 (patch) | |
| tree | f4a99115dbd52e29a5f5b7c0460b8bf82624e72d /target | |
| parent | 69d586d423bb7c29a19de5c7181050b2aef1f4d7 (diff) | |
| download | upstream-bc4ae75a7d991f024b1b19f7e1ee070b62064c32.tar.gz upstream-bc4ae75a7d991f024b1b19f7e1ee070b62064c32.tar.bz2 upstream-bc4ae75a7d991f024b1b19f7e1ee070b62064c32.zip | |
[brcm63xx] revert r21085, fixes #7282
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21352 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch | 2 | ||||
| -rw-r--r-- | target/linux/brcm63xx/patches-2.6.33/040-bcm963xx_flashmap.patch | 2 |
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; |