diff --git a/[refs] b/[refs]
index 5c9f4673a4c0..f2c48f9d802a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59bd71a81b66990564eac69aedd28ad87a2c81f4
+refs/heads/master: 2984ff38ccf6cbc02a7a996a36c7d6f69f3c6146
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 16ace89613bc..3beed83437a3 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -4036,6 +4036,11 @@ static void *cfq_init_queue(struct request_queue *q)
 
 	if (blkio_alloc_blkg_stats(&cfqg->blkg)) {
 		kfree(cfqg);
+
+		spin_lock(&cic_index_lock);
+		ida_remove(&cic_index_ida, cfqd->cic_index);
+		spin_unlock(&cic_index_lock);
+
 		kfree(cfqd);
 		return NULL;
 	}