Merge branch 'linus' into core/softlockup

[linux-2.6-omap-h63xx.git] / drivers / virtio / virtio.c

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 5b78fd0aff0a6d50306c75f80d99f52f97dbe99e..018c070a357f8138852a41fe4ec46d8cc4cf2f98 100644 (file)
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -176,7 +176,7 @@ int register_virtio_device(struct virtio_device *dev)
 
        /* Assign a unique device index and hence name. */
        dev->index = dev_index++;
-       sprintf(dev->dev.bus_id, "virtio%u", dev->index);
+       dev_set_name(&dev->dev, "virtio%u", dev->index);
 
        /* We always start by resetting the device, in case a previous
         * driver messed it up.  This also tests that code path a little. */