Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

[mv-sheeva.git] / block / noop-iosched.c

diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index 06389e9ef96d552836a1509ddf86745d82c09762..413a0b1d788c745df932745a65adb36ec119afaa 100644 (file)
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -94,9 +94,7 @@ static struct elevator_type elevator_noop = {
 
 static int __init noop_init(void)
 {
-       elv_register(&elevator_noop);
-
-       return 0;
+       return elv_register(&elevator_noop);
 }
 
 static void __exit noop_exit(void)