X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=block%2Fcfq-iosched.c;h=13553e015d7203f244db2e411884c56cbee1bc26;hb=b5677d848cbb94220ac2cfd36d93bcdbe49c3280;hp=0b4a47905575f2ee658d8a2f1e373aec71e935e5;hpb=cb834e7cc0e8b223386f219c1d1986846c87c55f;p=linux-2.6

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 0b4a479055..13553e015d 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2279,8 +2279,6 @@ static struct elevator_type iosched_cfq = {
 
 static int __init cfq_init(void)
 {
-	int ret;
-
 	/*
 	 * could be 0 on HZ < 1000 setups
 	 */
@@ -2292,11 +2290,9 @@ static int __init cfq_init(void)
 	if (cfq_slab_setup())
 		return -ENOMEM;
 
-	ret = elv_register(&iosched_cfq);
-	if (ret)
-		cfq_slab_kill();
+	elv_register(&iosched_cfq);
 
-	return ret;
+	return 0;
 }
 
 static void __exit cfq_exit(void)