minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-15 06:55:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

fdt: check for fdt errors in fdt_create_phandle

Browse Source 
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>
This commit is contained in:
Timur Tabi 2011-09-20 18:24:34 -05:00 committed by Gerald Van Baren
parent 8ddb10eae0
commit 3c927cccdc
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/fdt_support.c
View File

@ -1241,15 +1241,22 @@ int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle)
* @fdt: ptr to device tree * @fdt: ptr to device tree
* @nodeoffset: node to update * @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 */ /* see if there is a phandle already */
int phandle = fdt_get_phandle(fdt, nodeoffset); int phandle = fdt_get_phandle(fdt, nodeoffset);
/* if we got 0, means no phandle so create one */ /* if we got 0, means no phandle so create one */
if (phandle == 0) { if (phandle == 0) {
int ret;
phandle = fdt_alloc_phandle(fdt); 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; return phandle;

2
include/fdt_support.h
View File

@ -97,7 +97,7 @@ int fdt_node_offset_by_compat_reg(void *blob, const char *compat,
phys_addr_t compat_off); phys_addr_t compat_off);
int fdt_alloc_phandle(void *blob); int fdt_alloc_phandle(void *blob);
int fdt_set_phandle(void *fdt, int nodeoffset, uint32_t phandle); 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_add_edid(void *blob, const char *compat, unsigned char *buf);
int fdt_verify_alias_address(void *fdt, int anode, const char *alias, int fdt_verify_alias_address(void *fdt, int anode, const char *alias,