diff options
| author | Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> | 2012-07-17 22:05:03 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-26 08:54:55 +0200 |
| commit | 273a5768211450a303c455ff111b77d7ae621973 (patch) | |
| tree | 5f66bee035f17929664d0031a1659ebff0ebc41a /drivers/net/wireless/iwlwifi | |
| parent | iwlwifi: s/iwl_ucode_callback/iwl_req_fw_callback (diff) | |
| download | linux-273a5768211450a303c455ff111b77d7ae621973.tar.xz linux-273a5768211450a303c455ff111b77d7ae621973.zip | |
iwlwifi: clean up properly when registration with mac80211 fails
If registration with mac80211 fails, stop the thermal
throttling and testmode work that were previously started.
Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c index 84d3db5aa506..e8ffbe424b42 100644 --- a/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/drivers/net/wireless/iwlwifi/dvm/main.c @@ -1473,6 +1473,9 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans, return op_mode; out_destroy_workqueue: + iwl_tt_exit(priv); + iwl_testmode_free(priv); + iwl_cancel_deferred_work(priv); destroy_workqueue(priv->workqueue); priv->workqueue = NULL; iwl_uninit_drv(priv); |