system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-25 20:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: dgap: Simplify and cleanup dgap_init_module function

Browse source 
This patch simplifies and cleans up the dgap_init_module function. It also fixes
a possible double free condition as a result pci_unregister_driver possibly
being called twice.

Signed-off-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mark Hounschell 2014-03-06 15:25:19 -05:00 committed by Greg Kroah-Hartman
parent 434b679bdb
commit 002de0ba87
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/staging/dgap/dgap.c
View file

@ -519,37 +519,25 @@ static int dgap_init_module(void)
dgap_driver_state = DRIVER_NEED_CONFIG_LOAD;
/*
* Initialize global stuff
*/
rc = dgap_start();
if (rc < 0)
if (rc)
return rc;
/*
* Find and configure all the cards
*/
rc = dgap_init_pci();
if (rc)
goto err_cleanup;
/*
* 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
pr_err("dgap: driver load failed. No boards found.\n");
rc = dgap_create_driver_sysfiles(&dgap_driver);
if (rc)
goto err_cleanup;
dgap_cleanup_module();
} else {
rc = dgap_create_driver_sysfiles(&dgap_driver);
if (rc)
dgap_cleanup_module();
else
dgap_driver_state = DRIVER_READY;
}
dgap_driver_state = DRIVER_READY;
return 0;
err_cleanup:
dgap_cleanup_module();
return rc;
}