diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2019-05-10 12:35:17 +0200 |
|---|---|---|
| committer |   Luca Coelho <luciano.coelho@intel.com> | 2019-06-29 10:09:39 +0300 |
| commit | ee3399e5230c5a22185aefb2cbfffdfe0f46dd7c (patch) | |
| tree | c743c65a6f6a60ea89a546543057a323e4520e9a /drivers/net/wireless | |
| parent | iwlwifi: mvm: convert to FW AC when configuring MU EDCA (diff) | |
| download | linux-dev-ee3399e5230c5a22185aefb2cbfffdfe0f46dd7c.tar.xz linux-dev-ee3399e5230c5a22185aefb2cbfffdfe0f46dd7c.zip | |
iwlwifi: fix module init error paths
When the module fails to initialize for some reason, it
doesn't clean up properly. Fix that.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 4d6249b7bb0d..063313f4a992 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1745,7 +1745,7 @@ IWL_EXPORT_SYMBOL(iwl_opmode_deregister); static int __init iwl_drv_init(void) { - int i; + int i, err; mutex_init(&iwlwifi_opmode_table_mtx); @@ -1760,7 +1760,17 @@ static int __init iwl_drv_init(void) iwl_dbgfs_root = debugfs_create_dir(DRV_NAME, NULL); #endif - return iwl_pci_register_driver(); + err = iwl_pci_register_driver(); + if (err) + goto cleanup_debugfs; + + return 0; + +cleanup_debugfs: +#ifdef CONFIG_IWLWIFI_DEBUGFS + debugfs_remove_recursive(iwl_dbgfs_root); +#endif + return err; } module_init(iwl_drv_init); |