]> www.infradead.org Git - users/willy/linux.git/commitdiff
staging: gpib: fluke: Handle gpib_register_driver() errors
authorNihar Chaithanya <niharchaithanya@gmail.com>
Mon, 30 Dec 2024 18:56:26 +0000 (00:26 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Jan 2025 14:38:55 +0000 (15:38 +0100)
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 and gpib registering
functions if subsequent gpib_register_driver() fail and return the
error value. Add pr_err() statements indicating the fail and the error
value.

Signed-off-by: Nihar Chaithanya <niharchaithanya@gmail.com>
Link: https://lore.kernel.org/r/20241230185633.175690-7-niharchaithanya@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gpib/eastwood/fluke_gpib.c

index 3f938ab0c84d98a05b0080a8c32dd17640c6972d..875b3adcb5848322958f877ee4779b8767fd905e 100644 (file)
@@ -1155,16 +1155,38 @@ static int __init fluke_init_module(void)
 
        result = platform_driver_register(&fluke_gpib_platform_driver);
        if (result) {
-               pr_err("fluke_gpib: platform_driver_register failed!\n");
+               pr_err("fluke_gpib: platform_driver_register failed: error = %d\n", result);
                return result;
        }
 
-       gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE);
-       gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE);
-       gpib_register_driver(&fluke_interface, THIS_MODULE);
+       result = gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE);
+       if (result) {
+               pr_err("fluke_gpib: gpib_register_driver failed: error = %d\n", result);
+               goto err_unaccel;
+       }
+
+       result = gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE);
+       if (result) {
+               pr_err("fluke_gpib: gpib_register_driver failed: error = %d\n", result);
+               goto err_hybrid;
+       }
+
+       result = gpib_register_driver(&fluke_interface, THIS_MODULE);
+       if (result) {
+               pr_err("fluke_gpib: gpib_register_driver failed: error = %d\n", result);
+               goto err_interface;
+       }
 
-       pr_info("fluke_gpib\n");
        return 0;
+
+err_interface:
+       gpib_unregister_driver(&fluke_hybrid_interface);
+err_hybrid:
+       gpib_unregister_driver(&fluke_unaccel_interface);
+err_unaccel:
+       platform_driver_unregister(&fluke_gpib_platform_driver);
+
+       return result;
 }
 
 static void __exit fluke_exit_module(void)