Merge tag 'driver-core-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / of / resolver.c

diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 99309cb..cfaeef5 100644 (file)
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -84,10 +84,9 @@ static int update_usages_of_a_phandle_reference(struct device_node *overlay,
        int offset, len;
        int err = 0;
 
-       value = kmalloc(prop_fixup->length, GFP_KERNEL);
+       value = kmemdup(prop_fixup->value, prop_fixup->length, GFP_KERNEL);
        if (!value)
                return -ENOMEM;
-       memcpy(value, prop_fixup->value, prop_fixup->length);
 
        /* prop_fixup contains a list of tuples of path:property_name:offset */
        end = value + prop_fixup->length;
@@ -165,7 +164,6 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
        struct property *prop_fix, *prop;
        int err, i, count;
        unsigned int off;
-       phandle phandle;
 
        if (!local_fixups)
                return 0;
@@ -195,9 +193,7 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
                        if ((off + 4) > prop->length)
                                return -EINVAL;
 
-                       phandle = be32_to_cpu(*(__be32 *)(prop->value + off));
-                       phandle += phandle_delta;
-                       *(__be32 *)(prop->value + off) = cpu_to_be32(phandle);
+                       be32_add_cpu(prop->value + off, phandle_delta);
                }
        }
 
@@ -275,11 +271,18 @@ int of_resolve_phandles(struct device_node *overlay)
                err = -EINVAL;
                goto out;
        }
+
+#if 0
+       Temporarily disable check so that old style overlay unittests
+       do not fail when of_resolve_phandles() is moved into
+       of_overlay_apply().
+
        if (!of_node_check_flag(overlay, OF_DETACHED)) {
                pr_err("overlay not detached\n");
                err = -EINVAL;
                goto out;
        }
+#endif
 
        phandle_delta = live_tree_max_phandle() + 1;
        adjust_overlay_phandles(overlay, phandle_delta);