Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 54fecc49a1fe..f297891d8529 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -45,6 +45,9 @@ void __of_detach_node_sysfs(struct device_node *np)
 {
         struct property *pp;
 
+        if (!IS_ENABLED(CONFIG_SYSFS))
+                return;
+
         BUG_ON(!of_node_is_initialized(np));
         if (!of_kset)
                 return;