Skip to content

Commit dbb301f

Browse files
mcgrofaxboe
authored andcommitted
virtio_blk: add error handling support for add_disk()
We never checked for errors on add_disk() as this function returned void. Now that this is fixed, use the shiny new error handling. Signed-off-by: Luis Chamberlain <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 83cbce9 commit dbb301f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/block/virtio_blk.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,9 +875,14 @@ static int virtblk_probe(struct virtio_device *vdev)
875875
virtblk_update_capacity(vblk, false);
876876
virtio_device_ready(vdev);
877877

878-
device_add_disk(&vdev->dev, vblk->disk, virtblk_attr_groups);
878+
err = device_add_disk(&vdev->dev, vblk->disk, virtblk_attr_groups);
879+
if (err)
880+
goto out_cleanup_disk;
881+
879882
return 0;
880883

884+
out_cleanup_disk:
885+
blk_cleanup_disk(vblk->disk);
881886
out_free_tags:
882887
blk_mq_free_tag_set(&vblk->tag_set);
883888
out_free_vq:

0 commit comments

Comments
 (0)