diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-08-11 13:06:23 (GMT) |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 13:06:23 (GMT) |
| commit | 663d3f7c2e5e1b018a4c53277ccfde40329d98ca (patch) | |
| tree | a3afcc2d8fe682bdcc4c2e39b47ab3987b38c69a /drivers/of/device.c | |
| parent | b775e642bf958a02210ac4d4edd1a1b7067c49fa (diff) | |
| parent | b6ae5dc54b0a5c542d06d46b9083ceb70bf7e083 (diff) | |
| download | linux-663d3f7c2e5e1b018a4c53277ccfde40329d98ca.tar.xz | |
Merge branch 'devicetree/next-overlay' into devicetree/next
Conflicts:
drivers/of/testcase-data/testcases.dts
Diffstat (limited to 'drivers/of/device.c')
| -rw-r--r-- | drivers/of/device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/device.c b/drivers/of/device.c index dafb973..46d6c75c 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -160,7 +160,7 @@ void of_device_uevent(struct device *dev, struct kobj_uevent_env *env) add_uevent_var(env, "OF_COMPATIBLE_N=%d", seen); seen = 0; - mutex_lock(&of_aliases_mutex); + mutex_lock(&of_mutex); list_for_each_entry(app, &aliases_lookup, link) { if (dev->of_node == app->np) { add_uevent_var(env, "OF_ALIAS_%d=%s", seen, @@ -168,7 +168,7 @@ void of_device_uevent(struct device *dev, struct kobj_uevent_env *env) seen++; } } - mutex_unlock(&of_aliases_mutex); + mutex_unlock(&of_mutex); } int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env) |