From: Wey-Yi Guy Date: Thu, 3 Jun 2010 17:14:01 +0000 (-0700) Subject: iwlwifi: cancel run time calibration work when going down X-Git-Tag: v5.15~28789^2~540^2~104 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=815e629bfe97d59d8da3aa65dd92bb8a6439699a;p=mirror_ubuntu-kernels.git 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 Signed-off-by: Reinette Chatre --- 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);