1 files changed, 11 insertions, 4 deletions

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index ddfe09b45134..c952b981e4f2 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -478,10 +478,14 @@ static int __init hypfs_init(void)
                 rc = -ENODATA;
                 goto fail_hypfs_diag_exit;
         }
+        if (hypfs_sprp_init()) {
+                rc = -ENODATA;
+                goto fail_hypfs_vm_exit;
+        }
         s390_kobj = kobject_create_and_add("s390", hypervisor_kobj);
         if (!s390_kobj) {
                 rc = -ENOMEM;
-                goto fail_hypfs_vm_exit;
+                goto fail_hypfs_sprp_exit;
         }
         rc = register_filesystem(&hypfs_type);
         if (rc)
@@ -490,6 +494,8 @@ static int __init hypfs_init(void)
 
 fail_filesystem:
         kobject_put(s390_kobj);
+fail_hypfs_sprp_exit:
+        hypfs_sprp_exit();
 fail_hypfs_vm_exit:
         hypfs_vm_exit();
 fail_hypfs_diag_exit:
@@ -502,11 +508,12 @@ fail_dbfs_exit:
 
 static void __exit hypfs_exit(void)
 {
-        hypfs_diag_exit();
-        hypfs_vm_exit();
-        hypfs_dbfs_exit();
         unregister_filesystem(&hypfs_type);
         kobject_put(s390_kobj);
+        hypfs_sprp_exit();
+        hypfs_vm_exit();
+        hypfs_diag_exit();
+        hypfs_dbfs_exit();
 }
 
 module_init(hypfs_init)