Merge tag 'powerpc-5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

[linux.git] / drivers / of / overlay.c

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index c423e94baf0f02ba6aee663273a229502eb952cb..9617b7df7c4da2f6092d10f2971a6ef1b022b131 100644 (file)
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -305,7 +305,6 @@ static int add_changeset_property(struct overlay_changeset *ovcs,
 {
        struct property *new_prop = NULL, *prop;
        int ret = 0;
-       bool check_for_non_overlay_node = false;
 
        if (target->in_livetree)
                if (!of_prop_cmp(overlay_prop->name, "name") ||
@@ -318,6 +317,25 @@ static int add_changeset_property(struct overlay_changeset *ovcs,
        else
                prop = NULL;
 
+       if (prop) {
+               if (!of_prop_cmp(prop->name, "#address-cells")) {
+                       if (!of_prop_val_eq(prop, overlay_prop)) {
+                               pr_err("ERROR: changing value of #address-cells is not allowed in %pOF\n",
+                                      target->np);
+                               ret = -EINVAL;
+                       }
+                       return ret;
+
+               } else if (!of_prop_cmp(prop->name, "#size-cells")) {
+                       if (!of_prop_val_eq(prop, overlay_prop)) {
+                               pr_err("ERROR: changing value of #size-cells is not allowed in %pOF\n",
+                                      target->np);
+                               ret = -EINVAL;
+                       }
+                       return ret;
+               }
+       }
+
        if (is_symbols_prop) {
                if (prop)
                        return -EINVAL;
@@ -330,33 +348,18 @@ static int add_changeset_property(struct overlay_changeset *ovcs,
                return -ENOMEM;
 
        if (!prop) {
-               check_for_non_overlay_node = true;
                if (!target->in_livetree) {
                        new_prop->next = target->np->deadprops;
                        target->np->deadprops = new_prop;
                }
                ret = of_changeset_add_property(&ovcs->cset, target->np,
                                                new_prop);
-       } else if (!of_prop_cmp(prop->name, "#address-cells")) {
-               if (!of_prop_val_eq(prop, new_prop)) {
-                       pr_err("ERROR: changing value of #address-cells is not allowed in %pOF\n",
-                              target->np);
-                       ret = -EINVAL;
-               }
-       } else if (!of_prop_cmp(prop->name, "#size-cells")) {
-               if (!of_prop_val_eq(prop, new_prop)) {
-                       pr_err("ERROR: changing value of #size-cells is not allowed in %pOF\n",
-                              target->np);
-                       ret = -EINVAL;
-               }
        } else {
-               check_for_non_overlay_node = true;
                ret = of_changeset_update_property(&ovcs->cset, target->np,
                                                   new_prop);
        }
 
-       if (check_for_non_overlay_node &&
-           !of_node_check_flag(target->np, OF_OVERLAY))
+       if (!of_node_check_flag(target->np, OF_OVERLAY))
                pr_err("WARNING: memory leak will occur if overlay removed, property: %pOF/%s\n",
                       target->np, new_prop->name);