diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-15 18:16:07 -0400 |
| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 (patch) | |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /drivers/s390/s390_rdev.c | |
| parent | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (diff) | |
| parent | a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/s390/s390_rdev.c')
| -rw-r--r-- | drivers/s390/s390_rdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c index 3c7145d9f9a1..64371c05a3b3 100644 --- a/drivers/s390/s390_rdev.c +++ b/drivers/s390/s390_rdev.c | |||
| @@ -30,7 +30,7 @@ s390_root_dev_register(const char *name) | |||
| 30 | dev = kzalloc(sizeof(struct device), GFP_KERNEL); | 30 | dev = kzalloc(sizeof(struct device), GFP_KERNEL); |
| 31 | if (!dev) | 31 | if (!dev) |
| 32 | return ERR_PTR(-ENOMEM); | 32 | return ERR_PTR(-ENOMEM); |
| 33 | strncpy(dev->bus_id, name, min(strlen(name), (size_t)BUS_ID_SIZE)); | 33 | dev_set_name(dev, name); |
| 34 | dev->release = s390_root_dev_release; | 34 | dev->release = s390_root_dev_release; |
| 35 | ret = device_register(dev); | 35 | ret = device_register(dev); |
| 36 | if (ret) { | 36 | if (ret) { |