[PATCH 1/2] of: skip machine device creation on subsequent of_probe

[Ahmad Fatoum]

of_probe may be called more than once, e.g. after oftree -p or by board
code after fixing up device tree. This currently leads to a harmless,
but annoying error message about machine already being registered.

Avoid this by creating the device only once.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 drivers/of/base.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 910348fb81b9..ec4f9327036c 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2333,9 +2333,12 @@ mem_initcall(of_probe_memory);
 
 static void of_platform_device_create_root(struct device_node *np)
 {
-	struct device_d *dev;
+	static struct device_d *dev;
 	int ret;
 
+	if (dev)
+		return;
+
 	dev = xzalloc(sizeof(*dev));
 	dev->id = DEVICE_ID_SINGLE;
 	dev->device_node = np;
-- 
2.30.2