diff --git a/[refs] b/[refs]
index 981ab649a7a9..1acc50776f4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1ffe737f5b743115ee46ffb59e338e580c54902
+refs/heads/master: 39c01b219fd30c74869b6fc8749f7900f04e9ef6
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 2f91c5351949..2c7a0f4f3cd7 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -1723,6 +1723,8 @@ static struct cfq_queue *cfq_close_cooperator(struct cfq_data *cfqd,
 {
 	struct cfq_queue *cfqq;
 
+	if (cfq_class_idle(cur_cfqq))
+		return NULL;
 	if (!cfq_cfqq_sync(cur_cfqq))
 		return NULL;
 	if (CFQQ_SEEKY(cur_cfqq))