From: Saravana Kannan <saravanak@google.com>
Date: Wed, 7 Aug 2019 02:05:58 +0000 (-0700)
Subject: of/platform: Fix device_links_supplier_sync_state_resume() warning
X-Git-Tag: v5.4-rc1~137^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5adf5781019dd21233d6d13ab0d78bf03a13d4f1;p=thirdparty%2Fkernel%2Flinux.git

of/platform: Fix device_links_supplier_sync_state_resume() warning

In platforms/devices which have CONFIG_OF turned on but don't have a
populated DT, the calls to device_links_supplier_sync_state_pause() and
device_links_supplier_sync_state_resume() can get mismatched. This will
cause a warning during boot. Fix the warning by making sure the calls are
matched even in that case.

Reported-by: Qian Cai <cai@lca.pw>
Signed-off-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20190807020559.74458-1-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index f68de5c4aeff9..a3cd69772264b 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -723,7 +723,8 @@ arch_initcall_sync(of_platform_default_populate_init);
 
 static int __init of_platform_sync_state_init(void)
 {
-	device_links_supplier_sync_state_resume();
+	if (of_have_populated_dt())
+		device_links_supplier_sync_state_resume();
 	return 0;
 }
 late_initcall_sync(of_platform_sync_state_init);