diff --git a/fs/autofs4/init.c b/fs/autofs4/init.c
index c038727b405031fb91052c7af314d62508c3a5bd..cddc74b9cdb2d03f6e2203666c86118ef60596c6 100644
--- a/fs/autofs4/init.c
+++ b/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;
 }