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 /kernel | |
| parent | 117430b1fa3ae0b0bd981226bdb0c5412729c1db (diff) | |
| parent | 9e993efb0da827634778554070f3c3ec4bdade33 (diff) | |
| download | kernel_goldelico_gta04-271368b69b9e8042063d6c713423e84503bbdaa0.zip kernel_goldelico_gta04-271368b69b9e8042063d6c713423e84503bbdaa0.tar.gz kernel_goldelico_gta04-271368b69b9e8042063d6c713423e84503bbdaa0.tar.bz2 | |
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 'kernel')
| -rw-r--r-- | kernel/module.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/module.c b/kernel/module.c index f77e893..fbc51de 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -2419,12 +2419,6 @@ void module_remove_driver(struct device_driver *drv) kfree(driver_name); } } - /* - * Undo the additional reference we added in module_add_driver() - * via kset_find_obj() - */ - if (drv->mod_name) - kobject_put(&drv->kobj); } EXPORT_SYMBOL(module_remove_driver); #endif |