diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 12:59:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 12:59:26 -0800 |
| commit | 5fe8252fc3a21666cf19053fbd7ec7bd9664f5d9 (patch) | |
| tree | 07fbc97eabdafe48362ba4f295474c86309a5602 /lib/kobject.c | |
| parent | 460223d21d960e420775ca4d11ddaa8389af4d25 (diff) | |
| parent | ef665c1a06be719ed9a6b0ad7967137258d9457a (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:
sysfs: fix build errors: uevent with CONFIG_SYSFS=n
pcmcia: some class_device fallout
Driver core: device_add_attrs() cleanup
debugfs: Remove misleading comments.
debugfs: implement symbolic links
Driver: remove redundant kobject_unregister checks
kobject: kobj->k_name verification fix
serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
Driver core: let request_module() send a /sys/modules/kmod/-uevent
Driver.h copyright update
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 2782f49e906..93685f43bb9 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -171,7 +171,7 @@ int kobject_shadow_add(struct kobject * kobj, struct dentry *shadow_parent) return -ENOENT; if (!kobj->k_name) kobj->k_name = kobj->name; - if (!kobj->k_name) { + if (!*kobj->k_name) { pr_debug("kobject attempted to be registered with no name!\n"); WARN_ON(1); return -EINVAL; |