Patchwork [U-Boot,1/3] fdt: check for fdt errors in fdt_create_phandle

login
register
mail settings
Submitter Timur Tabi
Date Sept. 20, 2011, 11:24 p.m.
Message ID <1316561076-24923-1-git-send-email-timur@freescale.com>
Download mbox | patch
Permalink /patch/115648/
State Accepted
Commit 3c927cccdc930e15cc993e27ac3bee8e15682423
Delegated to: Jerry Van Baren
Headers show

Comments

Timur Tabi - Sept. 20, 2011, 11:24 p.m.
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>
---
 common/fdt_support.c  |   11 +++++++++--
 include/fdt_support.h |    2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)
Jerry Van Baren - Oct. 15, 2011, 3:34 p.m.
On 09/20/2011 07:24 PM, Timur Tabi wrote:
> 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>
> ---
>   common/fdt_support.c  |   11 +++++++++--
>   include/fdt_support.h |    2 +-
>   2 files changed, 10 insertions(+), 3 deletions(-)

Added to u-boot-fdt, sent a pull request to wd.

Thanks,
gvb

[snip]

Patch

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 46aa842..698abf7 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 8f06aac..7206c56 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -90,7 +90,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,