X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=block%2Fblk-cgroup.c;h=c195365c98172e133972ccb899433ba5a4ba81c8;hb=a55b7bb1c14662490689e094964ecc5387bb2b55;hp=619a79b51068cd8aa8fa2a5ba4142c9123de4c18;hpb=c0a4f5b354dc26573cfaa541064fd35a794eb166;p=linux-2.6-microblaze.git

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 619a79b51068..c195365c9817 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1152,13 +1152,15 @@ int blkcg_init_queue(struct request_queue *q)
 	if (preloaded)
 		radix_tree_preload_end();
 
-	ret = blk_iolatency_init(q);
+	ret = blk_throtl_init(q);
 	if (ret)
 		goto err_destroy_all;
 
-	ret = blk_throtl_init(q);
-	if (ret)
+	ret = blk_iolatency_init(q);
+	if (ret) {
+		blk_throtl_exit(q);
 		goto err_destroy_all;
+	}
 	return 0;
 
 err_destroy_all: