Fixed an OF-tree off-by-one bug when adding a new property name.
authorZhang Wei <wei.zhang@freescale.com>
Mon, 28 Aug 2006 06:25:31 +0000 (14:25 +0800)
committerMatthew McClintock <msm@freescale.com>
Wed, 30 Aug 2006 19:33:50 +0000 (14:33 -0500)
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)

common/ft_build.c

index b5a997c..b5937e3 100644 (file)
@@ -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* */