diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 17:54:55 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 17:54:55 +0900 |
| commit | 31a3fcab118f169613777c913f6a35b1ab138591 (patch) | |
| tree | c70e751bd6db90291e11a7a67f958c4c01b01f22 /drivers | |
| parent | 60b5f90d0fac7585f1a43ccdad06787b97eda0ab (diff) | |
| parent | dfc44f8030653b345fc6fb337558c3a07536823f (diff) | |
Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux
Pull device tree fixes from Grant Likely:
"Drivercore bugfixes for v3.15
This branch contains bug fixes important to get into v3.15. There is
a fix for modifying properties seen during early boot, a fix for an
incorrect prototype when CONFIG_OF=n, and a couple of corrections to
device tree memory nodes on a few platforms"
* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
mips: dts: Fix missing device_type="memory" property in memory nodes
arm: dts: Fix missing device_type="memory" for ste-ccu8540
of: fix CONFIG_OF=n prototype of of_node_full_name()
of: make of_update_property() usable earlier in the boot process
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/base.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 6d4ee22708c9..32e969d95319 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1831,6 +1831,10 @@ int of_update_property(struct device_node *np, struct property *newprop) if (!found) return -ENODEV; + /* At early boot, bail out and defer setup to of_init() */ + if (!of_kset) + return found ? 0 : -ENODEV; + /* Update the sysfs attribute */ sysfs_remove_bin_file(&np->kobj, &oldprop->attr); __of_add_property_sysfs(np, newprop); |