Update ofnode_add_subnode() and ofnode_add_prop() to return a suitable
error when space is exhausted in the FDT. This makes it easier to see
what is going wrong.

Signed-off-by: Simon Glass <s...@chromium.org>
---

(no changes since v1)

 drivers/core/ofnode.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index ec03f6f550d..5b8be218d3b 100644
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -1607,9 +1607,10 @@ ofnode ofnode_by_prop_value(ofnode from, const char 
*propname,
 int ofnode_write_prop(ofnode node, const char *propname, const void *value,
                      int len, bool copy)
 {
+       int ret;
+
        if (of_live_active()) {
                void *newval;
-               int ret;
 
                if (copy) {
                        newval = malloc(len);
@@ -1623,8 +1624,12 @@ int ofnode_write_prop(ofnode node, const char *propname, 
const void *value,
                        free(newval);
                return ret;
        } else {
-               return fdt_setprop(ofnode_to_fdt(node), ofnode_to_offset(node),
-                                  propname, value, len);
+               ret = fdt_setprop(ofnode_to_fdt(node), ofnode_to_offset(node),
+                                 propname, value, len);
+               if (ret)
+                       return ret == -FDT_ERR_NOSPACE ? -ENOSPC : -EINVAL;
+
+               return 0;
        }
 }
 
@@ -1897,7 +1902,7 @@ int ofnode_add_subnode(ofnode node, const char *name, 
ofnode *subnodep)
                        ret = -EEXIST;
                }
                if (offset < 0)
-                       return -EINVAL;
+                       return offset == -FDT_ERR_NOSPACE ? -ENOSPC : -EINVAL;
                subnode = noffset_to_ofnode(node, offset);
        }
 
-- 
2.34.1

Reply via email to