staging: gpib: fmh: Handle gpib_register_driver() errors

The function gpib_register_driver() can fail, resulting in a
semi-registered module and does not return an error value if it
fails.

Unregister the previous platform driver, pci and gpib registering
functions if subsequent gpib_register_driver() fail and return the
error value. Add pr_err() statements indicating the fail and also the
error value.

Signed-off-by: Nihar Chaithanya <niharchaithanya@gmail.com>
Link: https://lore.kernel.org/r/20241230185633.175690-8-niharchaithanya@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
index 62791db1c34a4fc25978c1bea85fb079a8053e4e..90108ce0304aa3ea72fc980d98c208c787b71840 100644 (file)
--- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
+++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
@@ -1691,23 +1691,54 @@ static int __init fmh_gpib_init_module(void)
 
        result = platform_driver_register(&fmh_gpib_platform_driver);
        if (result) {
-               pr_err("fmh_gpib: platform_driver_register failed!\n");
+               pr_err("fmh_gpib: platform_driver_register failed: error = %d\n", result);
                return result;
        }
 
        result = pci_register_driver(&fmh_gpib_pci_driver);
        if (result) {
-               pr_err("fmh_gpib: pci_driver_register failed!\n");
-               return result;
+               pr_err("fmh_gpib: pci_register_driver failed: error = %d\n", result);
+               goto err_pci_driver;
+       }
+
+       result = gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE);
+       if (result) {
+               pr_err("fmh_gpib: gpib_register_driver failed: error = %d\n", result);
+               goto err_unaccel;
+       }
+
+       result = gpib_register_driver(&fmh_gpib_interface, THIS_MODULE);
+       if (result) {
+               pr_err("fmh_gpib: gpib_register_driver failed: error = %d\n", result);
+               goto err_interface;
        }
 
-       gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE);
-       gpib_register_driver(&fmh_gpib_interface, THIS_MODULE);
-       gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MODULE);
-       gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE);
+       result = gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MODULE);
+       if (result) {
+               pr_err("fmh_gpib: gpib_register_driver failed: error = %d\n", result);
+               goto err_pci_unaccel;
+       }
+
+       result = gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE);
+       if (result) {
+               pr_err("fmh_gpib: gpib_register_driver failed: error = %d\n", result);
+               goto err_pci;
+       }
 
-       pr_info("fmh_gpib\n");
        return 0;
+
+err_pci:
+       gpib_unregister_driver(&fmh_gpib_pci_unaccel_interface);
+err_pci_unaccel:
+       gpib_unregister_driver(&fmh_gpib_interface);
+err_interface:
+       gpib_unregister_driver(&fmh_gpib_unaccel_interface);
+err_unaccel:
+       pci_unregister_driver(&fmh_gpib_pci_driver);
+err_pci_driver:
+       platform_driver_unregister(&fmh_gpib_platform_driver);
+
+       return result;
 }
 
 static void __exit fmh_gpib_exit_module(void)