diff options
| author | Timur Tabi <timur@freescale.com> | 2011-09-20 18:24:34 -0500 |
|---|---|---|
| committer | Gerald Van Baren <gvb@unssw.com> | 2011-10-15 09:35:00 -0400 |
| commit | 3c927cccdc930e15cc993e27ac3bee8e15682423 (patch) | |
| tree | 63b2e8b1d4c525cb4f42114c27a9de024111cb40 | |
| parent | 8ddb10eae0c0e6936c69b19c21aaa2f6e0433717 (diff) | |
| download | blackbird-obmc-uboot-3c927cccdc930e15cc993e27ac3bee8e15682423.tar.gz blackbird-obmc-uboot-3c927cccdc930e15cc993e27ac3bee8e15682423.zip | |
fdt: check for fdt errors in fdt_create_phandle
fdt_create_phandle() was ignoring errors from fdt_set_phandle(). If an
error occurs, print an error message and return 0, which is an invalid
phandle. We also need to change the return type for fdt_create_phandle()
to indicate that it cannot return an error code.
Signed-off-by: Timur Tabi <timur@freescale.com>
| -rw-r--r-- | common/fdt_support.c | 11 | ||||
| -rw-r--r-- | include/fdt_support.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 46aa84220b..698abf7b23 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -1241,15 +1241,22 @@ int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle) * @fdt: ptr to device tree * @nodeoffset: node to update */ -int fdt_create_phandle(void *fdt, int nodeoffset) +unsigned int fdt_create_phandle(void *fdt, int nodeoffset) { /* see if there is a phandle already */ int phandle = fdt_get_phandle(fdt, nodeoffset); /* if we got 0, means no phandle so create one */ if (phandle == 0) { + int ret; + phandle = fdt_alloc_phandle(fdt); - fdt_set_phandle(fdt, nodeoffset, phandle); + ret = fdt_set_phandle(fdt, nodeoffset, phandle); + if (ret < 0) { + printf("Can't set phandle %u: %s\n", phandle, + fdt_strerror(ret)); + return 0; + } } return phandle; diff --git a/include/fdt_support.h b/include/fdt_support.h index 0091dc3ebe..4826eee1ba 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -97,7 +97,7 @@ int fdt_node_offset_by_compat_reg(void *blob, const char *compat, phys_addr_t compat_off); int fdt_alloc_phandle(void *blob); int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle); -int fdt_create_phandle(void *fdt, int nodeoffset); +unsigned int fdt_create_phandle(void *fdt, int nodeoffset); int fdt_add_edid(void *blob, const char *compat, unsigned char *buf); int fdt_verify_alias_address(void *fdt, int anode, const char *alias, |
