]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
iwlwifi: clean up properly when registration with mac80211 fails
authorMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Tue, 17 Jul 2012 20:05:03 +0000 (13:05 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 26 Jul 2012 06:54:55 +0000 (08:54 +0200)
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>
drivers/net/wireless/iwlwifi/dvm/main.c

index 84d3db5aa506c113c572f46cae1d58b4525c3b0a..e8ffbe424b42dd68782be30c06c57d33ba91a8e6 100644 (file)
@@ -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);