diff options
| author | Scott Wood <scottwood@freescale.com> | 2007-03-12 14:41:45 -0600 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-03-13 21:15:50 +1100 |
| commit | c8aa72633e65c5c215b0cdd9970642e2a4f9a9a3 (patch) | |
| tree | 05e7ea880e68580fe654c1d4f6e50c0f52acc703 | |
| parent | 1c53a496ba6132a37f052aa907e23445b3fe928c (diff) | |
| download | blackbird-op-linux-c8aa72633e65c5c215b0cdd9970642e2a4f9a9a3.tar.gz blackbird-op-linux-c8aa72633e65c5c215b0cdd9970642e2a4f9a9a3.zip | |
[POWERPC] bootwrapper: Make ft_get_phandle() accept and return NULL.
Currently, if ft_get_phandle() is passed NULL it will allocate an entry
for it and return a non-NULL phandle. This patch makes it simply pass
the NULL through.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/boot/flatdevtree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c index 971420af08d4..6c1877358aed 100644 --- a/arch/powerpc/boot/flatdevtree.c +++ b/arch/powerpc/boot/flatdevtree.c @@ -40,6 +40,9 @@ static void *ft_get_phandle(struct ft_cxt *cxt, char *node) { unsigned int i; + if (!node) + return NULL; + for (i = 1; i < cxt->nodes_used; i++) /* already there? */ if (cxt->node_tbl[i] == node) return (void *)i; |
