diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
| commit | cbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch) | |
| tree | 65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /lib | |
| parent | 7b0c8fcff47a885743125dd843db64af41af5a61 (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index a6dec32f2ddd..bacf6fe4f7a0 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -218,6 +218,9 @@ int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, | |||
| 218 | const char *old_name = kobj->name; | 218 | const char *old_name = kobj->name; |
| 219 | char *s; | 219 | char *s; |
| 220 | 220 | ||
| 221 | if (kobj->name && !fmt) | ||
| 222 | return 0; | ||
| 223 | |||
| 221 | kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs); | 224 | kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs); |
| 222 | if (!kobj->name) | 225 | if (!kobj->name) |
| 223 | return -ENOMEM; | 226 | return -ENOMEM; |