diff options
author | Meenakshi Venkataraman <meenakshi.venkataraman@intel.com> | 2012-07-17 16:05:03 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-26 02:54:55 -0400 |
commit | 273a5768211450a303c455ff111b77d7ae621973 (patch) | |
tree | 5f66bee035f17929664d0031a1659ebff0ebc41a /drivers/net | |
parent | 1c8e11e117c28ef6b9591b489f2bbd38894ba811 (diff) |
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')
-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, | |||
1473 | return op_mode; | 1473 | return op_mode; |
1474 | 1474 | ||
1475 | out_destroy_workqueue: | 1475 | out_destroy_workqueue: |
1476 | iwl_tt_exit(priv); | ||
1477 | iwl_testmode_free(priv); | ||
1478 | iwl_cancel_deferred_work(priv); | ||
1476 | destroy_workqueue(priv->workqueue); | 1479 | destroy_workqueue(priv->workqueue); |
1477 | priv->workqueue = NULL; | 1480 | priv->workqueue = NULL; |
1478 | iwl_uninit_drv(priv); | 1481 | iwl_uninit_drv(priv); |