---

yaml --- r: 311583 b: refs/heads/master c: fd79495 h: refs/heads/master i: 311581: f0df299 311579: 54dbf46 311575: 5da3d20 311567: 6b700bb 311551: 606cd78 v: v3
git-mirror · Jun 4, 2012 · caca8ee · caca8ee
1 parent d36caf0
commit caca8ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;