aboutsummaryrefslogtreecommitdiff
path: root/drivers/of/dynamic.c
diff options
context:
space:
mode:
authorGaurav Minocha <gaurav.minocha.os@gmail.com>2014-09-05 09:56:13 -0700
committerMark Brown <broonie@kernel.org>2015-02-20 23:41:18 +0900
commited22824fc77e158ae6075b06c3047a12731553c3 (patch)
tree128b334b0aa4bb91d3650adfdbd078d44c7690f6 /drivers/of/dynamic.c
parent220f5ea9df1e8ded213958f635b5310de44305d2 (diff)
downloadlinux-linaro-stable-ed22824fc77e158ae6075b06c3047a12731553c3.tar.gz
of: Disabling OF functions that use sysfs if CONFIG_SYSFS disabled
This patch is to the fix the recent runtime bug in kernel reported by <fengguang.wu@intel.com>. The bug was exposed by commit b951f9dc, "Enabling OF selftest to run without machine's devicetree" and is exposed when CONFIG_OF_SELFTEST is enabled and CONFIG_SYSFS is disabled. Mail Subject: [OF test] BUG: unable to handle kernel NULL pointer dereference at 00000038 Tested on x86 and arm architecture Signed-off-by: Gaurav Minocha <gaurav.minocha.os@gmail.com> Signed-off-by: Grant Likely <grant.likely@linaro.org> (cherry picked from commit ef69d74035befbddd7c2b7e86120e49191107acc) Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/of/dynamic.c')
-rw-r--r--drivers/of/dynamic.c3
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;