[PATCH 3/3] staging: dgap: fix error handling in dgap_init_module()
No need to call pci_unregister_driver() if pci_register_driver() failed.
Signed-off-by: Alexey Khoroshilov
---
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(_driver);
- else
- printk("WARNING: dgap driver load failed. No DGAP
boards found.\n");
-
dgap_cleanup_module();
- } else {
- dgap_create_driver_sysfiles(_driver);
- dgap_driver_state = DRIVER_READY;
+ return rc;
}
+ dgap_create_driver_sysfiles(_driver);
+ dgap_driver_state = DRIVER_READY;
+
return rc;
}
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/3] staging: dgap: fix error handling in dgap_init_module()
No need to call pci_unregister_driver() if pci_register_driver() failed.
Signed-off-by: Alexey Khoroshilov khoroshi...@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
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/3] staging: dgap: fix error handling in dgap_init_module()
No need to call pci_unregister_driver() if pci_register_driver() failed.
Signed-off-by: Alexey Khoroshilov
---
drivers/staging/dgap/dgap_driver.c | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/dgap/dgap_driver.c
b/drivers/staging/dgap/dgap_driver.c
index 136c879b560c..cc6933db6feb 100644
--- a/drivers/staging/dgap/dgap_driver.c
+++ b/drivers/staging/dgap/dgap_driver.c
@@ -254,18 +254,10 @@ 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(_driver);
- else
- printk("WARNING: dgap driver load failed. No DGAP
boards found.\n");
-
+ if (rc < 0)
dgap_cleanup_module();
- }
- else {
+ else
dgap_create_driver_sysfiles(_driver);
- }
DPR_INIT(("Finished init_module. Returning %d\n", rc));
return (rc);
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/3] staging: dgap: fix error handling in dgap_init_module()
No need to call pci_unregister_driver() if pci_register_driver() failed.
Signed-off-by: Alexey Khoroshilov khoroshi...@ispras.ru
---
drivers/staging/dgap/dgap_driver.c | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/dgap/dgap_driver.c
b/drivers/staging/dgap/dgap_driver.c
index 136c879b560c..cc6933db6feb 100644
--- a/drivers/staging/dgap/dgap_driver.c
+++ b/drivers/staging/dgap/dgap_driver.c
@@ -254,18 +254,10 @@ 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);
-
+ if (rc 0)
dgap_cleanup_module();
- }
- else {
+ else
dgap_create_driver_sysfiles(dgap_driver);
- }
DPR_INIT((Finished init_module. Returning %d\n, rc));
return (rc);
--
1.8.3.2
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
