diff --git a/block/blk-core.c b/block/blk-core.c
index 9e43501d77595ad40c9b492a820edf420442051f..bbd3d4560458f431f8cf4bf37e59b5bce47be12d 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -398,8 +398,10 @@ void blk_cleanup_queue(struct request_queue *q)
 	del_timer_sync(&q->backing_dev_info->laptop_mode_wb_timer);
 	blk_sync_queue(q);
 
-	if (queue_is_mq(q))
+	if (queue_is_mq(q)) {
+		blk_mq_cancel_work_sync(q);
 		blk_mq_exit_queue(q);
+	}
 
 	/*
 	 * In theory, request pool of sched_tags belongs to request queue.
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 751b7b0bec88fabc0b5365fb5bd17abd30b31043..65f4f2d3f30f793a4ceed61c1fde3b1ef641bf66 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -790,16 +790,6 @@ static void blk_release_queue(struct kobject *kobj)
 
 	blk_free_queue_stats(q->stats);
 
-	if (queue_is_mq(q)) {
-		struct blk_mq_hw_ctx *hctx;
-		int i;
-
-		cancel_delayed_work_sync(&q->requeue_work);
-
-		queue_for_each_hw_ctx(q, hctx, i)
-			cancel_delayed_work_sync(&hctx->run_work);
-	}
-
 	blk_exit_queue(q);
 
 	blk_queue_free_zone_bitmaps(q);
diff --git a/block/genhd.c b/block/genhd.c
index f94152e99876b5314f1b0201f142afdffdd8d949..5b6cd992c6a6fe470eb6cead6f4ec21ba9dc953a 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1572,6 +1572,7 @@ static void disk_release(struct device *dev)
 	might_sleep();
 
 	blk_free_devt(dev->devt);
+	blk_mq_cancel_work_sync(disk->queue);
 	disk_release_events(disk);
 	kfree(disk->random);
 	disk_replace_part_tbl(disk, NULL);