2 files changed, 1 insertions, 4 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 561e8a1b43a4..243d18b4ceb0 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -404,6 +404,7 @@ EXPORT_SYMBOL(blk_stop_queue);
 void blk_sync_queue(struct request_queue *q)
 {
         del_timer_sync(&q->unplug_timer);
+        del_timer_sync(&q->timeout);
         kblockd_flush_work(&q->unplug_work);
 }
 EXPORT_SYMBOL(blk_sync_queue);
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 99c3efc706b7..a09535377a94 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -73,11 +73,7 @@ ssize_t part_timeout_store(struct device *dev, struct device_attribute *attr,
  */
 void blk_delete_timer(struct request *req)
 {
-        struct request_queue *q = req->q;
-
         list_del_init(&req->timeout_list);
-        if (list_empty(&q->timeout_list))
-                del_timer(&q->timeout);
 }
 
 static void blk_rq_timed_out(struct request *req)