From: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Date: Tue, 17 Jul 2012 20:05:03 +0000 (-0700)
Subject: iwlwifi: clean up properly when registration with mac80211 fails
X-Git-Tag: next-20120823~60^2^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=273a5768211450a303c455ff111b77d7ae621973;p=karo-tx-linux.git

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>
---

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);