aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-09-07 16:43:29 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-09-07 16:43:29 +0000
commitd2a9c35af083f9285830e49525db590f2aa16a71 (patch)
tree0448bdf17f83f8c36f2509ef22a67a38a8c09a5e
parentda2178eb7e02f8482d3b0e59372a2a04cb4a0bfe (diff)
downloadupstream-d2a9c35af083f9285830e49525db590f2aa16a71.tar.gz
upstream-d2a9c35af083f9285830e49525db590f2aa16a71.tar.bz2
upstream-d2a9c35af083f9285830e49525db590f2aa16a71.zip
brcm47xx: fix reading WGT634U CFE variables with 4.1
This ports fix from r46584 to the 4.1. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 46806
-rw-r--r--target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch
index 644abde604..4738c223c4 100644
--- a/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch
+++ b/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch
@@ -279,9 +279,9 @@ out the configuration than the in kernel cfe config reader.
/* TODO: when nvram is on nand flash check for bad blocks first. */
off = FLASH_MIN;
while (off <= lim) {
-@@ -186,6 +208,13 @@ int bcm47xx_nvram_getenv(const char *nam
- return err;
- }
+@@ -180,6 +202,13 @@ int bcm47xx_nvram_getenv(const char *nam
+ if (!name)
+ return -EINVAL;
+ if (cfe_env) {
+ value = cfe_env_get(nvram_buf, name);
@@ -290,6 +290,6 @@ out the configuration than the in kernel cfe config reader.
+ return snprintf(val, val_len, "%s", value);
+ }
+
- /* Look for name=value and return value */
- var = &nvram_buf[sizeof(struct nvram_header)];
- end = nvram_buf + sizeof(nvram_buf);
+ if (!nvram_len) {
+ err = nvram_init();
+ if (err)