From 9c1c4b49c90ae358f90f84285bcf733293ada2b0 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Wed, 12 Dec 2007 08:23:05 +1100 Subject: [PATCH] --- yaml --- r: 81090 b: refs/heads/master c: 2a9d2d97d370e3fe959312762c3190e6a6ae9e11 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/libfdt-wrapper.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 88c706cda5ae..43a7093a6d05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 754e5f3f3a96264b96d5593242d81c7468af70cb +refs/heads/master: 2a9d2d97d370e3fe959312762c3190e6a6ae9e11 diff --git a/trunk/arch/powerpc/boot/libfdt-wrapper.c b/trunk/arch/powerpc/boot/libfdt-wrapper.c index 868c5049a80b..97af36c224bd 100644 --- a/trunk/arch/powerpc/boot/libfdt-wrapper.c +++ b/trunk/arch/powerpc/boot/libfdt-wrapper.c @@ -48,7 +48,8 @@ check_err(_offset) ? NULL : (void *)(_offset+1); \ }) -#define devp_offset(devp) (((int)(devp))-1) +#define devp_offset_find(devp) (((int)(devp))-1) +#define devp_offset(devp) (devp ? ((int)(devp))-1 : 0) static void *fdt; static void *buf; /* = NULL */ @@ -127,8 +128,9 @@ static void *fdt_wrapper_find_node_by_prop_value(const void *prev, const char *val, int len) { - return offset_devp(fdt_node_offset_by_prop_value(fdt, devp_offset(prev), - name, val, len)); + int offset = fdt_node_offset_by_prop_value(fdt, devp_offset_find(prev), + name, val, len); + return offset_devp(offset); } static char *fdt_wrapper_get_path(const void *devp, char *buf, int len)