Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[linux-2.6-omap-h63xx.git] / drivers / infiniband / core / sysfs.c

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 4f4d1bb9f069fa6a8f61c0027eb1f07c377d3664..b43f7d3682d387eb4de8bf3581a9499660cd97db 100644 (file)
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -778,7 +778,7 @@ int ib_device_register_sysfs(struct ib_device *device)
        class_dev->class      = &ib_class;
        class_dev->driver_data = device;
        class_dev->parent     = device->dma_device;
-       strlcpy(class_dev->bus_id, device->name, BUS_ID_SIZE);
+       dev_set_name(class_dev, device->name);
 
        INIT_LIST_HEAD(&device->port_list);