diff options
| author | Grant Likely | 2009-11-23 22:49:36 +0100 |
|---|---|---|
| committer | Grant Likely | 2009-11-23 22:49:36 +0100 |
| commit | 2cfcadde83b308240690ff1c18f117d8bc7a08b0 (patch) | |
| tree | aa0795966d070d1f7a5221232d9ba47744bddb5f /arch/sparc/kernel/prom_common.c | |
| parent | of: merge of_find_all_nodes() implementations (diff) | |
| parent | Linux 2.6.32-rc8 (diff) | |
| download | kernel-qcow2-linux-2cfcadde83b308240690ff1c18f117d8bc7a08b0.tar.gz kernel-qcow2-linux-2cfcadde83b308240690ff1c18f117d8bc7a08b0.tar.xz kernel-qcow2-linux-2cfcadde83b308240690ff1c18f117d8bc7a08b0.zip | |
Merge commit 'v2.6.32-rc8'
Diffstat (limited to 'arch/sparc/kernel/prom_common.c')
| -rw-r--r-- | arch/sparc/kernel/prom_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c index 138910c67206..d80a65d9e893 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/arch/sparc/kernel/prom_common.c @@ -79,6 +79,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len err = -ENODEV; + mutex_lock(&of_set_property_mutex); write_lock(&devtree_lock); prevp = &dp->properties; while (*prevp) { @@ -88,9 +89,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len void *old_val = prop->value; int ret; - mutex_lock(&of_set_property_mutex); ret = prom_setprop(dp->node, name, val, len); - mutex_unlock(&of_set_property_mutex); err = -EINVAL; if (ret >= 0) { @@ -109,6 +108,7 @@ int of_set_property(struct device_node *dp, const char *name, void *val, int len prevp = &(*prevp)->next; } write_unlock(&devtree_lock); + mutex_unlock(&of_set_property_mutex); /* XXX Upate procfs if necessary... */ |