Merge branch 'next'

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/core/root.c b/drivers/core/root.c
index d43645f34dd..2aa16d59b69 100644
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -81,10 +81,9 @@ static int dm_setup_inst(void)
 		/* Now allocate space for the priv/plat data, and copy it in */
 		size = __priv_data_end - __priv_data_start;
 
-		base = calloc(1, size);
+		base = memdup(__priv_data_start, size);
 		if (!base)
 			return log_msg_ret("priv", -ENOMEM);
-		memcpy(base, __priv_data_start, size);
 		gd_set_dm_priv_base(base);
 	}
 
@@ -460,7 +459,7 @@ static int root_acpi_get_name(const struct udevice *dev, char *out_name)
 	return acpi_copy_name(out_name, "\\_SB");
 }
 
-struct acpi_ops root_acpi_ops = {
+static const struct acpi_ops root_acpi_ops = {
 	.get_name	= root_acpi_get_name,
 };
 #endif