[PATCH 10/61] bootwrapper: flatdevtree fixes
From: Scott Wood <hidden>
Date: 2007-07-18 01:33:15
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
1. ft_create_node was returning the internal pointer rather than a phandle. 2. ft_find_device_rel was treating lookups relative to root as an error. Signed-off-by: Scott Wood <redacted> --- arch/powerpc/boot/flatdevtree.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c
index b732644..5b69aeb 100644
--- a/arch/powerpc/boot/flatdevtree.c
+++ b/arch/powerpc/boot/flatdevtree.c@@ -659,9 +659,13 @@ void *ft_find_device_rel(struct ft_cxt *cxt, const void *top, { char *node; - node = ft_node_ph2node(cxt, top); - if (node == NULL) - return NULL; + if (top) { + node = ft_node_ph2node(cxt, top); + if (node == NULL) + return NULL; + } else { + node = ft_root_node(cxt); + } node = ft_find_descendent(cxt, node, srch_path); return ft_get_phandle(cxt, node);
@@ -990,7 +994,7 @@ void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *name) cxt->p = p; ft_begin_node(cxt, name); ft_end_node(cxt); - return p; + return ft_find_device_rel(cxt, parent, name); } p = next; }
--
1.5.0.3