From patchwork Mon Jun 14 18:24:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reinette Chatre X-Patchwork-Id: 106001 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5EIP52b002669 for ; Mon, 14 Jun 2010 18:25:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753187Ab0FNSZA (ORCPT ); Mon, 14 Jun 2010 14:25:00 -0400 Received: from mga01.intel.com ([192.55.52.88]:13219 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753060Ab0FNSYz (ORCPT ); Mon, 14 Jun 2010 14:24:55 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 14 Jun 2010 11:20:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,415,1272870000"; d="scan'208";a="576289753" Received: from rchatre-desk.jf.intel.com (HELO localhost.localdomain) ([134.134.15.235]) by fmsmga002.fm.intel.com with ESMTP; 14 Jun 2010 11:23:32 -0700 From: Reinette Chatre To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, ipw3945-devel@lists.sourceforge.net, Wey-Yi Guy , Reinette Chatre Subject: [PATCH 3/6] iwlwifi: cancel run time calibration work when going down Date: Mon, 14 Jun 2010 11:24:49 -0700 Message-Id: <1276539892-12471-4-git-send-email-reinette.chatre@intel.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1276539892-12471-1-git-send-email-reinette.chatre@intel.com> References: <1276539892-12471-1-git-send-email-reinette.chatre@intel.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 14 Jun 2010 18:25:06 +0000 (UTC) diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index ce88bc0..4ade9a6 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);