summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorweiping zhang <zwp10758@gmail.com>2017-11-29 09:23:01 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-16 10:33:48 +0100
commit94739ddf35cba7c4002489f212186010888b421e (patch)
tree8e98040141fa2bfc5aa095fbaa6e670051fe31e3 /drivers
parentd73fcef16da050b6a6db8c86d8f4a69836d9b5e7 (diff)
virtio: release virtio index when fail to device_register
commit e60ea67bb60459b95a50a156296041a13e0e380e upstream. index can be reused by other virtio device. Signed-off-by: weiping zhang <zhangweiping@didichuxing.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/virtio/virtio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 7062bb0975a5..462e183609b6 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -323,6 +323,8 @@ int register_virtio_device(struct virtio_device *dev)
/* device_register() causes the bus infrastructure to look for a
* matching driver. */
err = device_register(&dev->dev);
+ if (err)
+ ida_simple_remove(&virtio_index_ida, dev->index);
out:
if (err)
add_status(dev, VIRTIO_CONFIG_S_FAILED);