kernel: update 4.0 to 4.0.5

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-4.0 / 030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch

diff --git a/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch b/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch
index 50b9f2dacade214f87e99eba603f9acaeeccd9b9..c40c8b7f89d399b49936756b11b03cf652d29a1a 100644 (file)
--- a/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch
+++ b/target/linux/brcm47xx/patches-4.0/030-09-MIPS-BCM47XX-Don-t-try-guessing-NVRAM-size-on-MTD-pa.patch
@@ -19,8 +19,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/nvram.c | 36 ++++++++++++++----------------------
  1 file changed, 14 insertions(+), 22 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
-index 2ac7482..ba632ff 100644
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
 @@ -139,36 +139,28 @@ static int nvram_init(void)
@@ -39,28 +37,29 @@ index 2ac7482..ba632ff 100644
 -
 -              if (from < 0)
 -                      continue;
--
--              err = mtd_read(mtd, from, sizeof(header), &bytes_read,
--                             (uint8_t *)&header);
--              if (!err && header.magic == NVRAM_MAGIC) {
--                      u8 *dst = (uint8_t *)nvram_buf;
--                      size_t len = header.len;
 +      err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);
 +      if (!err && header.magic == NVRAM_MAGIC) {
 +              u8 *dst = (uint8_t *)nvram_buf;
 +              size_t len = header.len;
- 
--                      if (header.len > NVRAM_SPACE) {
--                              pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
--                                     header.len, NVRAM_SPACE);
--                              len = NVRAM_SPACE;
--                      }
++
 +              if (header.len > NVRAM_SPACE) {
 +                      pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
 +                              header.len, NVRAM_SPACE);
 +                      len = NVRAM_SPACE;
 +              }
  
+-              err = mtd_read(mtd, from, sizeof(header), &bytes_read,
+-                             (uint8_t *)&header);
+-              if (!err && header.magic == NVRAM_MAGIC) {
+-                      u8 *dst = (uint8_t *)nvram_buf;
+-                      size_t len = header.len;
+-
+-                      if (header.len > NVRAM_SPACE) {
+-                              pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
+-                                     header.len, NVRAM_SPACE);
+-                              len = NVRAM_SPACE;
+-                      }
+-
 -                      err = mtd_read(mtd, from, len, &bytes_read, dst);
 -                      if (err)
 -                              return err;
@@ -74,6 +73,3 @@ index 2ac7482..ba632ff 100644
        }
  #endif
  
--- 
-1.8.4.5
-