Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02b48265 authored by Asai Thambi SP's avatar Asai Thambi SP Committed by Jens Axboe
Browse files

mtip32xx: fix rmmod issue 



put_disk() need to be called after del_gendisk() to free the disk object structure.

Signed-off-by: default avatarSelvan Mani <smani@micron.com>
Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3715a5d0

drivers/block/mtip32xx/mtip32xx.c

+7 −6
Original line number Diff line number Diff line
@@ -2809,6 +2809,7 @@ static int mtip_free_orphan(struct driver_data *dd) 
				kobject_put(kobj);

			}

			del_gendisk(dd->disk);

			put_disk(dd->disk);

			dd->disk = NULL;

		}

		if (dd->queue) {
@@ -4095,12 +4096,12 @@ static int mtip_block_remove(struct driver_data *dd) 
			dd->bdev = NULL;

		}

		if (dd->disk) {

			if (dd->disk->queue) {

			del_gendisk(dd->disk);

			if (dd->disk->queue) {

				blk_cleanup_queue(dd->queue);

				blk_mq_free_tag_set(&dd->tags);

				dd->queue = NULL;

			} else

			}

			put_disk(dd->disk);

		}

		dd->disk  = NULL;
@@ -4140,11 +4141,11 @@ static int mtip_block_shutdown(struct driver_data *dd) 
		dev_info(&dd->pdev->dev,

			"Shutting down %s ...\n", dd->disk->disk_name);



		if (dd->disk->queue) {

		del_gendisk(dd->disk);

		if (dd->disk->queue) {

			blk_cleanup_queue(dd->queue);

			blk_mq_free_tag_set(&dd->tags);

		} else

		}

		put_disk(dd->disk);

		dd->disk  = NULL;

		dd->queue = NULL;