Commit:     c8aa72633e65c5c215b0cdd9970642e2a4f9a9a3
Parent:     1c53a496ba6132a37f052aa907e23445b3fe928c
Author:     Scott Wood <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 12 14:41:45 2007 -0600
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Tue Mar 13 21:15:50 2007 +1100

    [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 <[EMAIL PROTECTED]>
    Acked-by: Mark A. Greer <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 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 971420a..6c18773 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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to