Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  add SubmittingPatches to Documentation/ja_JP
  fix typo in SubmittingPatches
  Driver Core: fix bug in device_rename() for SYSFS_DEPRECATED=y
  sysfs: make sysfs_{get,put}_active() static
  kobject: check for duplicate names in kobject_rename
  Driver core: remove class_device_*_bin_file

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index 03d40360ff1b..a7e3bf4d3c70 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -308,6 +308,19 @@ int kobject_rename(struct kobject * kobj, const char *new_name)
         if (!kobj->parent)
                 return -EINVAL;
 
+        /* see if this name is already in use */
+        if (kobj->kset) {
+                struct kobject *temp_kobj;
+                temp_kobj = kset_find_obj(kobj->kset, new_name);
+                if (temp_kobj) {
+                        printk(KERN_WARNING "kobject '%s' can not be renamed "
+                               "to '%s' as '%s' is already in existance.\n",
+                               kobject_name(kobj), new_name, new_name);
+                        kobject_put(temp_kobj);
+                        return -EINVAL;
+                }
+        }
+
         devpath = kobject_get_path(kobj, GFP_KERNEL);
         if (!devpath) {
                 error = -ENOMEM;