diff options
| author | Michael Riesch <michael.riesch@wolfvision.net> | 2022-09-05 12:07:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-09-13 12:07:55 +0200 |
| commit | bc475fd88810f8fbb4b6f786d0a772b09f215d9d (patch) | |
| tree | d9b5ca6c9aa3c43b3abd74c537144f17a13903d6 /drivers | |
| parent | a30ae2921a78d68eee4cd526e9e200aba28aadc3 (diff) | |
| download | barebox-bc475fd88810f8fbb4b6f786d0a772b09f215d9d.tar.gz barebox-bc475fd88810f8fbb4b6f786d0a772b09f215d9d.tar.xz | |
of: overlay: improve error handling in of_overlay_apply_tree
Propagate any error from of_overlay_apply_symbols and let the user
know if the provided overlay is not applicable.
Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
Link: https://lore.barebox.org/20220905100717.150557-2-michael.riesch@wolfvision.net
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/overlay.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 20a43f5170..20686db511 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -115,8 +115,8 @@ static char *of_overlay_fix_path(struct device_node *root, return basprintf("%s%s", target->full_name, path_tail); } -static void of_overlay_apply_symbols(struct device_node *root, - struct device_node *overlay) +static int of_overlay_apply_symbols(struct device_node *root, + struct device_node *overlay) { const char *old_path; char *new_path; @@ -129,12 +129,12 @@ static void of_overlay_apply_symbols(struct device_node *root, if (!overlay_symbols) { pr_debug("overlay doesn't have a __symbols__ node\n"); - return; + return -EINVAL; } if (!root_symbols) { pr_info("root doesn't have a __symbols__ node\n"); - return; + return -EINVAL; } list_for_each_entry(prop, &overlay_symbols->properties, list) { @@ -148,6 +148,8 @@ static void of_overlay_apply_symbols(struct device_node *root, prop->name, new_path); of_property_write_string(root_symbols, prop->name, new_path); } + + return 0; } static int of_overlay_apply_fragment(struct device_node *root, @@ -190,7 +192,9 @@ int of_overlay_apply_tree(struct device_node *root, goto out_err; /* Copy symbols from resolved overlay to base device tree */ - of_overlay_apply_symbols(root, resolved); + err = of_overlay_apply_symbols(root, resolved); + if (err) + goto out_err; /* Copy nodes and properties from resolved overlay to root */ for_each_child_of_node(resolved, fragment) { |