Browse Source

ibmasmfs: make register_filesystem the last failure exit

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 13 năm trước cách đây
mục cha
commit
ea23b45310
1 tập tin đã thay đổi với 5 bổ sung6 xóa
  1. 5 6
      drivers/misc/ibmasm/module.c

+ 5 - 6
drivers/misc/ibmasm/module.c

@@ -211,18 +211,17 @@ static void __exit ibmasm_exit (void)
 
 
 static int __init ibmasm_init(void)
 static int __init ibmasm_init(void)
 {
 {
-	int result;
+	int result = pci_register_driver(&ibmasm_driver);
+	if (result)
+		return result;
 
 
 	result = ibmasmfs_register();
 	result = ibmasmfs_register();
 	if (result) {
 	if (result) {
+		pci_unregister_driver(&ibmasm_driver);
 		err("Failed to register ibmasmfs file system");
 		err("Failed to register ibmasmfs file system");
 		return result;
 		return result;
 	}
 	}
-	result = pci_register_driver(&ibmasm_driver);
-	if (result) {
-		ibmasmfs_unregister();
-		return result;
-	}
+
 	ibmasm_register_panic_notifier();
 	ibmasm_register_panic_notifier();
 	info(DRIVER_DESC " version " DRIVER_VERSION " loaded");
 	info(DRIVER_DESC " version " DRIVER_VERSION " loaded");
 	return 0;
 	return 0;