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 /drivers/base/core.c | |
| parent | 7b0c8fcff47a885743125dd843db64af41af5a61 (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index d230ff4b3eec..4aa527b8a913 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
| @@ -891,7 +891,8 @@ int device_add(struct device *dev) | |||
| 891 | set_dev_node(dev, dev_to_node(parent)); | 891 | set_dev_node(dev, dev_to_node(parent)); |
| 892 | 892 | ||
| 893 | /* first, register with generic layer. */ | 893 | /* first, register with generic layer. */ |
| 894 | error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev_name(dev)); | 894 | /* we require the name to be set before, and pass NULL */ |
| 895 | error = kobject_add(&dev->kobj, dev->kobj.parent, NULL); | ||
| 895 | if (error) | 896 | if (error) |
| 896 | goto Error; | 897 | goto Error; |
| 897 | 898 | ||