summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Wei <wei.zhang@freescale.com>2006-08-28 14:25:31 +0800
committerMatthew McClintock <msm@freescale.com>2006-08-30 14:33:50 -0500
commit88c8f4921fc47fb0eb2384b16586f1bd7f275be7 (patch)
tree9dd072a1b920e8db8d356ed84700919617744cfd
parentb2b78421d9db49c21a821af8a19c21c1f7dfb29e (diff)
downloadu-boot-imx-88c8f4921fc47fb0eb2384b16586f1bd7f275be7.zip
u-boot-imx-88c8f4921fc47fb0eb2384b16586f1bd7f275be7.tar.gz
u-boot-imx-88c8f4921fc47fb0eb2384b16586f1bd7f275be7.tar.bz2
Fixed an OF-tree off-by-one bug when adding a new property name.
This bug will cause the kernel booting to pause a long time. Signed-off-by: Zhang Wei <wei.zhang@freescale.com> (cherry picked from 2f15776ccc6dc32377d8ba9652b8f58059c27c6d commit)
-rw-r--r--common/ft_build.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/ft_build.c b/common/ft_build.c
index b5a997c..b5937e3 100644
--- a/common/ft_build.c
+++ b/common/ft_build.c
@@ -103,7 +103,7 @@ void ft_prop(struct ft_cxt *cxt, const char *name, const void *data, int sz)
if (off == -1) {
memcpy(cxt->p_end, name, strlen(name) + 1);
off = cxt->p_end - cxt->p;
- cxt->p_end += strlen(name) + 2;
+ cxt->p_end += strlen(name) + 1;
}
/* now put offset from beginning of *STRUCTURE* */