1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
index 1ecb179b8604..ff1cc968f96d 100644
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
@@ -2249,10 +2249,11 @@ static void cfq_put_cfqd(struct cfq_data *cfqd)
         if (!atomic_dec_and_test(&cfqd->ref))
                 return;
 
-        cfq_shutdown_timer_wq(cfqd);
-
         blk_put_queue(q);
 
+        cfq_shutdown_timer_wq(cfqd);
+        q->elevator->elevator_data = NULL;
+
         mempool_destroy(cfqd->crq_pool);
         kfree(cfqd->crq_hash);
         kfree(cfqd->cfq_hash);