From caca8ee9cd361308b06da0bd18c64ef6f51ff83f Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 4 Jun 2012 10:01:38 +0200
Subject: [PATCH] --- yaml --- r: 311583 b: refs/heads/master c:
 fd7949564ced88385ca7758a4c1f47c274233dd5 h: refs/heads/master i:   311581:
 f0df2996a03b72b4d6dd6fc00934b66e733c1ceb   311579:
 54dbf4693832ee375097a3a44a7a9d9f40880a65   311575:
 5da3d209b43750311d260af0a0c6d2a4bd6064c6   311567:
 6b700bb14d1a9915133b090223739182b39cf15b   311551:
 606cd78d0af42df0c3e8c08c4ad766e5b34ba698 v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d4fb3487872a..b628710029d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87c9ea76a242c2f9063e2a8f3e90846c932c61a7
+refs/heads/master: fd7949564ced88385ca7758a4c1f47c274233dd5
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 673c977cc2bf..ae5113d3ebae 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -4202,6 +4202,7 @@ static int __init cfq_init(void)
 	if (ret)
 		return ret;
 
+	ret = -ENOMEM;
 	cfq_pool = KMEM_CACHE(cfq_queue, 0);
 	if (!cfq_pool)
 		goto err_pol_unreg;