diff options
Diffstat (limited to 'arch/arm/mach-integrator/lm.c')
-rw-r--r-- | arch/arm/mach-integrator/lm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c index 622cdc4212dd..f939c5091405 100644 --- a/arch/arm/mach-integrator/lm.c +++ b/arch/arm/mach-integrator/lm.c | |||
@@ -81,8 +81,10 @@ int lm_device_register(struct lm_device *dev) | |||
81 | dev->dev.release = lm_device_release; | 81 | dev->dev.release = lm_device_release; |
82 | dev->dev.bus = &lm_bustype; | 82 | dev->dev.bus = &lm_bustype; |
83 | 83 | ||
84 | snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id), "lm%d", dev->id); | 84 | ret = dev_set_name(&dev->dev, "lm%d", dev->id); |
85 | dev->resource.name = dev->dev.bus_id; | 85 | if (ret) |
86 | return ret; | ||
87 | dev->resource.name = dev_name(&dev->dev); | ||
86 | 88 | ||
87 | ret = request_resource(&iomem_resource, &dev->resource); | 89 | ret = request_resource(&iomem_resource, &dev->resource); |
88 | if (ret == 0) { | 90 | if (ret == 0) { |