aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-06-03 10:14:01 -0700
committerReinette Chatre <reinette.chatre@intel.com>2010-06-14 10:59:43 -0700
commit815e629bfe97d59d8da3aa65dd92bb8a6439699a (patch)
tree345dfe326324a6094462a6b2c7276b14e664d02c /drivers/net/wireless/iwlwifi
parentiwlwifi: Fix null pointer referencing in iwl_dbgfs_rx_queue_read. (diff)
downloadlinux-dev-815e629bfe97d59d8da3aa65dd92bb8a6439699a.tar.xz
linux-dev-815e629bfe97d59d8da3aa65dd92bb8a6439699a.zip
iwlwifi: cancel run time calibration work when going down
Cancel scheduled run time calibration work when interface is going down. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ce88bc0aa520..4ade9a68278a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3641,6 +3641,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv)
cancel_delayed_work(&priv->scan_check);
cancel_work_sync(&priv->start_internal_scan);
cancel_delayed_work(&priv->alive_start);
+ cancel_work_sync(&priv->run_time_calib_work);
cancel_work_sync(&priv->beacon_update);
del_timer_sync(&priv->statistics_periodic);
del_timer_sync(&priv->ucode_trace);