From: Frank Rowand <frank.row...@sony.com>

Errors while developing the patch to create of_overlay_fdt_apply()
exposed inadequate error messages to debug problems when overlay
devicetree fragment nodes contain an invalid target path.  Improve
the messages in find_target_node() to remedy this.

Signed-off-by: Frank Rowand <frank.row...@sony.com>
---

Changes from v1:
  - split out from patch 1/2

 drivers/of/overlay.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 5f6c5569e97d..01362e7e98e3 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -488,17 +488,26 @@ static int build_changeset(struct overlay_changeset *ovcs)
  */
 static struct device_node *find_target_node(struct device_node *info_node)
 {
+       struct device_node *node;
        const char *path;
        u32 val;
        int ret;
 
        ret = of_property_read_u32(info_node, "target", &val);
-       if (!ret)
-               return of_find_node_by_phandle(val);
+       if (!ret) {
+               node = of_find_node_by_phandle(val);
+               if (!node)
+                       pr_err("target node find by phandle failed\n");
+               return node;
+       }
 
        ret = of_property_read_string(info_node, "target-path", &path);
-       if (!ret)
-               return of_find_node_by_path(path);
+       if (!ret) {
+               node =  of_find_node_by_path(path);
+               if (!node)
+                       pr_err("target node find by path failed\n");
+               return node;
+       }
 
        pr_err("Failed to find target for node %p (%s)\n",
                info_node, info_node->name);
-- 
Frank Rowand <frank.row...@sony.com>

Reply via email to