From: Alexey Khoroshilov <khoroshilov@ispras.ru>
To: Todza Louina <lidza.louina@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>,
driverdev-devel@linuxdriverproject.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
ldv-project@linuxtesting.org
Subject: [PATCH 3/3] staging: dgap: fix error handling in dgap_init_module()
Date: Mon, 3 Mar 2014 01:08:08 +0400 [thread overview]
Message-ID: <1393794488-12909-3-git-send-email-khoroshilov@ispras.ru> (raw)
In-Reply-To: <1393794488-12909-1-git-send-email-khoroshilov@ispras.ru>
No need to call pci_unregister_driver() if pci_register_driver() failed.
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
---
drivers/staging/dgap/dgap.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index b4157d7..510e8b3 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -535,18 +535,13 @@ int dgap_init_module(void)
* If something went wrong in the scan, bail out of driver.
*/
if (rc < 0) {
- /* Only unregister the pci driver if it was actually registered. */
- if (dgap_NumBoards)
- pci_unregister_driver(&dgap_driver);
- else
- printk("WARNING: dgap driver load failed. No DGAP boards found.\n");
-
dgap_cleanup_module();
- } else {
- dgap_create_driver_sysfiles(&dgap_driver);
- dgap_driver_state = DRIVER_READY;
+ return rc;
}
+ dgap_create_driver_sysfiles(&dgap_driver);
+ dgap_driver_state = DRIVER_READY;
+
return rc;
}
--
1.8.3.2
next prev parent reply other threads:[~2014-03-02 21:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-23 20:21 [PATCH 1/3] staging: dgap: remove unneeded status variables Alexey Khoroshilov
2014-02-23 20:21 ` Alexey Khoroshilov
2014-02-23 20:21 ` [PATCH 2/3] staging: dgap: implement proper error handling in dgap_start() Alexey Khoroshilov
2014-02-23 20:21 ` [PATCH 3/3] staging: dgap: fix error handling in dgap_init_module() Alexey Khoroshilov
2014-02-23 20:21 ` Alexey Khoroshilov
2014-02-25 0:51 ` [PATCH 1/3] staging: dgap: remove unneeded status variables Greg Kroah-Hartman
2014-02-25 0:51 ` Greg Kroah-Hartman
2014-03-02 21:08 ` Alexey Khoroshilov
2014-03-02 21:08 ` [PATCH 2/3] staging: dgap: implement proper error handling in dgap_start() Alexey Khoroshilov
2014-03-02 21:08 ` Alexey Khoroshilov [this message]
2014-03-06 22:18 ` [PATCH 1/3] staging: dgap: remove unneeded status variables Greg Kroah-Hartman
2014-03-08 21:01 ` [PATCH 1/2] " Alexey Khoroshilov
2014-03-08 21:01 ` Alexey Khoroshilov
2014-03-08 21:01 ` [PATCH 2/2] staging: dgap: implement proper error handling in dgap_start() Alexey Khoroshilov
2014-03-08 21:01 ` Alexey Khoroshilov
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=1393794488-12909-3-git-send-email-khoroshilov@ispras.ru \
--to=khoroshilov@ispras.ru \
--cc=devel@driverdev.osuosl.org \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=ldv-project@linuxtesting.org \
--cc=lidza.louina@gmail.com \
--cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.