diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /lib/kobject.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
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 b7e29a6056d3..4a1f33d43548 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -805,7 +805,7 @@ static struct kset *kset_create(const char *name, | |||
| 805 | kset = kzalloc(sizeof(*kset), GFP_KERNEL); | 805 | kset = kzalloc(sizeof(*kset), GFP_KERNEL); |
| 806 | if (!kset) | 806 | if (!kset) |
| 807 | return NULL; | 807 | return NULL; |
| 808 | retval = kobject_set_name(&kset->kobj, name); | 808 | retval = kobject_set_name(&kset->kobj, "%s", name); |
| 809 | if (retval) { | 809 | if (retval) { |
| 810 | kfree(kset); | 810 | kfree(kset); |
| 811 | return NULL; | 811 | return NULL; |