diff options
Diffstat (limited to 'drivers/of/overlay.c')
| -rw-r--r-- | drivers/of/overlay.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 0fc440fdcf..73c7a91db9 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -114,7 +114,7 @@ static char *of_overlay_fix_path(struct device_node *root, prefix = of_get_child_by_name(fragment, "__overlay__")->full_name; path_tail = path + strlen(prefix); - return basprintf("%s%s", target->full_name, path_tail); + return basprintf("%pOF%s", target, path_tail); } static int of_overlay_apply_symbols(struct device_node *root, @@ -131,12 +131,12 @@ static int of_overlay_apply_symbols(struct device_node *root, if (!overlay_symbols) { pr_debug("overlay doesn't have a __symbols__ node\n"); - return -EINVAL; + return 0; } if (!root_symbols) { pr_info("root doesn't have a __symbols__ node\n"); - return -EINVAL; + return 0; } list_for_each_entry(prop, &overlay_symbols->properties, list) { @@ -308,26 +308,15 @@ static bool of_overlay_matches_filter(const char *filename, struct device_node * int of_overlay_apply_file(struct device_node *root, const char *filename, bool filter) { - void *fdt; struct device_node *ovl; - size_t size; int ret; if (filter && !of_overlay_matches_filter(filename, NULL)) return 0; - ret = read_file_2(filename, &size, &fdt, FILESIZE_MAX); - if (ret) - return ret; - - ovl = of_unflatten_dtb(fdt, size); - - free(fdt); - - if (IS_ERR(ovl)) { - pr_err("Failed to unflatten %s: %pe\n", filename, ovl); + ovl = of_read_file(filename); + if (IS_ERR(ovl)) return PTR_ERR(ovl); - } if (filter && !of_overlay_matches_filter(NULL, ovl)) return 0; |