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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  kobject: new_device->kref wasn't putted after error in kobject_move()
  driver core: export device_rename
  Remove devfs from MAINTAINERS
  Driver core: add device symlink back to sysfs
  Revert "driver core: refcounting fix"

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index f4f6176dcd12..057921c5945a 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -385,9 +385,11 @@ int kobject_move(struct kobject *kobj, struct kobject *new_parent)
                 goto out;
         old_parent = kobj->parent;
         kobj->parent = new_parent;
+        new_parent = NULL;
         kobject_put(old_parent);
         kobject_uevent_env(kobj, KOBJ_MOVE, envp);
 out:
+        kobject_put(new_parent);
         kobject_put(kobj);
         kfree(devpath_string);
         kfree(devpath);