Merge branch linux-linaro-lsk-v3.10-android

[firefly-linux-kernel-4.4.55.git] / drivers / of / device.c

diff --git a/drivers/of/device.c b/drivers/of/device.c
index f685e55e0717f611bf479f95d790675d6bb77bf5..4f942b56fab95d117eb7c2aff94f3e8528361032 100644 (file)
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -157,7 +157,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,
@@ -165,7 +165,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)