]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
iwlwifi: cancel run time calibration work when going down
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 3 Jun 2010 17:14:01 +0000 (10:14 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Mon, 14 Jun 2010 17:59:43 +0000 (10:59 -0700)
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>
drivers/net/wireless/iwlwifi/iwl-agn.c

index ce88bc0aa52063b4501772ece03a375fbdcd8071..4ade9a68278a435b611df46b288a25a7f3257749 100644 (file)
@@ -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);