[PATCH v5 02/15] staging: gpib: agilent_82350b: Handle gpib_register_driver() errors

Nihar Chaithanya
2024-12-28T06:25:48Z

The function gpib_register_driver() can fail which can result in
semi-registered module.

In case gpib_register_driver() fails unregister the previous
gpib and pci registering functions, return the error value.

Signed-off-by: Nihar Chaithanya <niharchaithanya@gmail.com>
---
.../gpib/agilent_82350b/agilent_82350b.c | 21 ++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
index 53006d0cc79c..6f077ede86a6 100644
--- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
+++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
@@ -910,13 +910,28 @@ static int __init agilent_82350b_init_module(void)

result = pci_register_driver(&agilent_82350b_pci_driver);
if (result) {
- pr_err("agilent_82350b: pci_driver_register failed!\n");
+ pr_err("agilent_82350b: pci_driver_register failed: error = %d\n", result);
return result;
}

- gpib_register_driver(&agilent_82350b_unaccel_interface, THIS_MODULE);
- gpib_register_driver(&agilent_82350b_interface, THIS_MODULE);
+ result = gpib_register_driver(&agilent_82350b_unaccel_interface, THIS_MODULE);
+ if (result)
+ goto err_unaccel;
+
+ result = gpib_register_driver(&agilent_82350b_interface, THIS_MODULE);
+ if (result)
+ goto err_interface;
+
+ pr_info("agilent_82350b: module init is complete\n");
return 0;
+
+err_interface:
+ gpib_unregister_driver(&agilent_82350b_unaccel_interface);
+err_unaccel:
+ pci_unregister_driver(&agilent_82350b_pci_driver);
+
+ pr_err("agilent_82350b: gpib_register_driver failed!\n");
+ return result;
}

static void __exit agilent_82350b_exit_module(void)
--
2.34.1