diff --git a/[refs] b/[refs]
index 1722aa29f5cd..1ad3cd499af6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd05e42fa86e37b14f8169bbad8d334e2e8d4881
+refs/heads/master: 4fc207419d95e0e16fdc78e2f48f7c0b3640ffe5
diff --git a/trunk/drivers/block/cfq-iosched.c b/trunk/drivers/block/cfq-iosched.c
index 5281f8e70510..ecacca9c877e 100644
--- a/trunk/drivers/block/cfq-iosched.c
+++ b/trunk/drivers/block/cfq-iosched.c
@@ -2059,10 +2059,8 @@ static void cfq_put_cfqd(struct cfq_data *cfqd)
 	if (!atomic_dec_and_test(&cfqd->ref))
 		return;
 
-	blk_put_queue(q);
-
 	cfq_shutdown_timer_wq(cfqd);
-	q->elevator->elevator_data = NULL;
+	blk_put_queue(q);
 
 	mempool_destroy(cfqd->crq_pool);
 	kfree(cfqd->crq_hash);