diff --git a/[refs] b/[refs]
index 62560e7f6ff7..5d28c8643170 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca7068c41a8d48ef35d1a3bba422ebcedace8513
+refs/heads/master: 54bf586e1f51018ba7624c851e7aa14cee0548d2
diff --git a/trunk/fs/autofs4/init.c b/trunk/fs/autofs4/init.c
index c038727b4050..cddc74b9cdb2 100644
--- a/trunk/fs/autofs4/init.c
+++ b/trunk/fs/autofs4/init.c
@@ -31,11 +31,11 @@ static int __init init_autofs4_fs(void)
 {
 	int err;
 
+	autofs_dev_ioctl_init();
+
 	err = register_filesystem(&autofs_fs_type);
 	if (err)
-		return err;
-
-	autofs_dev_ioctl_init();
+		autofs_dev_ioctl_exit();
 
 	return err;
 }