staging: gpib: ni_usb: Handle gpib_register_driver() errors

The usb_register() function can fail and returns an error value which
is not returned. The function gpib_register_driver() can also fail
which can result in semi-registered module.

In case gpib_register_driver() fails unregister the previous usb driver
registering function. Return the error value if gpib_register_driver()
or usb_register() functions fail. Add pr_err() statements indicating the
fail and error value.

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

diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
index 70b8b305e13b6b4fdd3334973eb1e8bc8af91533..3c4132fd6de95ec32ee2c6c744864e0b4d7b3f92 100644 (file)
--- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
+++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
@@ -2619,12 +2619,23 @@ static struct usb_driver ni_usb_bus_driver = {
 static int __init ni_usb_init_module(void)
 {
        int i;
+       int ret;
 
        pr_info("ni_usb_gpib driver loading\n");
        for (i = 0; i < MAX_NUM_NI_USB_INTERFACES; i++)
                ni_usb_driver_interfaces[i] = NULL;
-       usb_register(&ni_usb_bus_driver);
-       gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE);
+
+       ret = usb_register(&ni_usb_bus_driver);
+       if (ret) {
+               pr_err("ni_usb_gpib: usb_register failed: error = %d\n", ret);
+               return ret;
+       }
+
+       ret = gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE);
+       if (ret) {
+               pr_err("ni_usb_gpib: gpib_register_driver failed: error = %d\n", ret);
+               return ret;
+       }
 
        return 0;
 }