Merge tag 'for-linus-6.0-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / drivers / block / xen-blkfront.c

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 4e763701b3720ea62fd5f766480ab83e487f1af9..8e56e69fb4c4e47f6886095493902946abe72fdf 100644 (file)
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2395,7 +2395,7 @@ static void blkfront_connect(struct blkfront_info *info)
 
        err = device_add_disk(&info->xbdev->dev, info->gd, NULL);
        if (err) {
-               blk_cleanup_disk(info->gd);
+               put_disk(info->gd);
                blk_mq_free_tag_set(&info->tag_set);
                info->rq = NULL;
                goto fail;
@@ -2480,7 +2480,7 @@ static int blkfront_remove(struct xenbus_device *xbdev)
        blkif_free(info, 0);
        if (info->gd) {
                xlbd_release_minors(info->gd->first_minor, info->gd->minors);
-               blk_cleanup_disk(info->gd);
+               put_disk(info->gd);
                blk_mq_free_tag_set(&info->tag_set);
        }