Merge commit 'upstream/master'

[pandora-kernel.git] / arch / arm / mach-integrator / lm.c

diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c
index 622cdc4..f939c50 100644 (file)
--- 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)
        dev->dev.release = lm_device_release;
        dev->dev.bus = &lm_bustype;
 
-       snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id), "lm%d", dev->id);
-       dev->resource.name = dev->dev.bus_id;
+       ret = dev_set_name(&dev->dev, "lm%d", dev->id);
+       if (ret)
+               return ret;
+       dev->resource.name = dev_name(&dev->dev);
 
        ret = request_resource(&iomem_resource, &dev->resource);
        if (ret == 0) {