Auto merge with /home/aegl/GIT/linus

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 2a4e7671eaf4..8e49d21057e4 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -197,7 +197,7 @@ void kobject_hotplug(struct kobject *kobj, enum kobject_action action)
         int i = 0;
         int retval;
         char *kobj_path = NULL;
-        char *name = NULL;
+        const char *name = NULL;
         char *action_string;
         u64 seq;
         struct kobject *top_kobj = kobj;
@@ -246,10 +246,10 @@ void kobject_hotplug(struct kobject *kobj, enum kobject_action action)
         if (hotplug_ops->name)
                 name = hotplug_ops->name(kset, kobj);
         if (name == NULL)
-                name = kset->kobj.name;
+                name = kobject_name(&kset->kobj);
 
         argv [0] = hotplug_path;
-        argv [1] = name;
+        argv [1] = (char *)name; /* won't be changed but 'const' has to go */
         argv [2] = NULL;
 
         /* minimal command environment */