From: Nihar Chaithanya <niharchaithanya@gmail.com>
To: dpenkler@gmail.com, gregkh@linuxfoundation.org
Cc: dan.carpenter@linaro.org, skhan@linuxfoundation.org,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Nihar Chaithanya <niharchaithanya@gmail.com>
Subject: [PATCH v6 14/15] staging: gpib: pc2: Handle gpib_register_driver() errors
Date: Tue, 31 Dec 2024 00:26:34 +0530 [thread overview]
Message-ID: <20241230185633.175690-15-niharchaithanya@gmail.com> (raw)
In-Reply-To: <20241230185633.175690-1-niharchaithanya@gmail.com>
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 gpib registering functions if subsequent
gpib_register_driver() fail and return the error value. Add pr_err()
statements indicating the fail and error value.
Signed-off-by: Nihar Chaithanya <niharchaithanya@gmail.com>
---
drivers/staging/gpib/pc2/pc2_gpib.c | 38 ++++++++++++++++++++++++++---
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/staging/gpib/pc2/pc2_gpib.c
index 7b3b34f47341..a9aae563f60a 100644
--- a/drivers/staging/gpib/pc2/pc2_gpib.c
+++ b/drivers/staging/gpib/pc2/pc2_gpib.c
@@ -635,12 +635,42 @@ void pc2_2a_detach(gpib_board_t *board)
static int __init pc2_init_module(void)
{
- gpib_register_driver(&pc2_interface, THIS_MODULE);
- gpib_register_driver(&pc2a_interface, THIS_MODULE);
- gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE);
- gpib_register_driver(&pc2_2a_interface, THIS_MODULE);
+ int ret;
+
+ ret = gpib_register_driver(&pc2_interface, THIS_MODULE);
+ if (ret) {
+ pr_err("pc2_gpib: gpib_register_driver failed: error = %d\n", ret);
+ return ret;
+ }
+
+ ret = gpib_register_driver(&pc2a_interface, THIS_MODULE);
+ if (ret) {
+ pr_err("pc2_gpib: gpib_register_driver failed: error = %d\n", ret);
+ goto err_pc2a;
+ }
+
+ ret = gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE);
+ if (ret) {
+ pr_err("pc2_gpib: gpib_register_driver failed: error = %d\n", ret);
+ goto err_cb7210;
+ }
+
+ ret = gpib_register_driver(&pc2_2a_interface, THIS_MODULE);
+ if (ret) {
+ pr_err("pc2_gpib: gpib_register_driver failed: error = %d\n", ret);
+ goto err_pc2_2a;
+ }
return 0;
+
+err_pc2_2a:
+ gpib_unregister_driver(&pc2a_cb7210_interface);
+err_cb7210:
+ gpib_unregister_driver(&pc2a_interface);
+err_pc2a:
+ gpib_unregister_driver(&pc2_interface);
+
+ return ret;
}
static void __exit pc2_exit_module(void)
--
2.34.1
next prev parent reply other threads:[~2024-12-30 19:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-30 18:56 [PATCH v6 00/15] staging: gpib: Handle gpib_register_driver() errors Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 01/15] staging: gpib: Modify gpib_register_driver() to return error if it fails Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 02/15] staging: gpib: agilent_82350b: Handle gpib_register_driver() errors Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 03/15] staging: gpib: agilent_82357a: " Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 04/15] staging: gpib: cb7210: " Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 05/15] staging: gpib: cec: " Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 06/15] staging: gpib: fluke: " Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 07/15] staging: gpib: fmh: " Nihar Chaithanya
2024-12-31 4:13 ` kernel test robot
2024-12-30 18:56 ` [PATCH v6 08/15] staging: gpib: gpio: Return error value from gpib_register_driver() Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 09/15] staging: gpib: hp_82335: " Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 10/15] staging: gpib: hp_82341: Handle gpib_register_driver() errors Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 11/15] staging: gpib: ines: " Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 12/15] staging: gpib: lpvo_usb: Return error value from gpib_register_driver() Nihar Chaithanya
2024-12-30 18:56 ` [PATCH v6 13/15] staging: gpib: ni_usb: Handle gpib_register_driver() errors Nihar Chaithanya
2024-12-30 18:56 ` Nihar Chaithanya [this message]
2024-12-30 18:56 ` [PATCH v6 15/15] staging: gpib: tnt4882: " Nihar Chaithanya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241230185633.175690-15-niharchaithanya@gmail.com \
--to=niharchaithanya@gmail.com \
--cc=dan.carpenter@linaro.org \
--cc=dpenkler@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox