diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 21:58:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-09 21:58:28 -0800 |
| commit | 271368b69b9e8042063d6c713423e84503bbdaa0 (patch) | |
| tree | 71d9c592d8b92bee80a03d2de74d1763b1282076 /lib | |
| parent | 117430b1fa3ae0b0bd981226bdb0c5412729c1db (diff) | |
| parent | 9e993efb0da827634778554070f3c3ec4bdade33 (diff) | |
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"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index f4f6176dcd1..057921c5945 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); |