From patchwork Fri Aug 24 14:17:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shajakhan, Mohammed" X-Patchwork-Id: 1371391 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9AE99DF28C for ; Fri, 24 Aug 2012 14:18:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759545Ab2HXOSD (ORCPT ); Fri, 24 Aug 2012 10:18:03 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:50773 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757700Ab2HXOSC (ORCPT ); Fri, 24 Aug 2012 10:18:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1345817882; x=1377353882; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=iCDkRFW2FSjf3dntEvsN4KxzGo5arxFRs1jKU3hstqA=; b=AiPzVcJVseOff05cI4dYxp1ktXJI8dDg2askaUhly7MmGBPUd/fzXOnU g0DMZMHXktGzVVy3Jywvc6vSwFAUtSMbJcY0HFibitpYgoG2tzrkI5GSf By9tTIIvQxziswiVS43ddhPH7+BtdMuRy9bWq293dCcVMTWfgRaMBxzUR E=; X-IronPort-AV: E=McAfee;i="5400,1158,6813"; a="226741877" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by wolverine02.qualcomm.com with ESMTP; 24 Aug 2012 07:18:02 -0700 X-IronPort-AV: E=Sophos;i="4.80,304,1344236400"; d="scan'208";a="375047121" Received: from nasanexhc10.na.qualcomm.com ([172.30.48.3]) by Ironmsg04-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 24 Aug 2012 07:18:02 -0700 Received: from nasanexhc05.na.qualcomm.com (172.30.48.2) by nasanexhc10.na.qualcomm.com (172.30.48.3) with Microsoft SMTP Server (TLS) id 14.2.318.1; Fri, 24 Aug 2012 07:18:01 -0700 Received: from qcmail1.qualcomm.com (172.30.48.1) by qcmail1.qualcomm.com (172.30.48.2) with Microsoft SMTP Server (TLS) id 14.2.318.1; Fri, 24 Aug 2012 07:17:59 -0700 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Fri, 24 Aug 2012 19:47:53 +0530 From: Mohammed Shafi Shajakhan To: "John W. Linville" CC: , Rodriguez Luis , , "Mohammed Shafi Shajakhan" Subject: [RFC 3/3] ath9k_htc: Cancel BTCOEX related work before disabling BTCOEX Date: Fri, 24 Aug 2012 19:47:31 +0530 Message-ID: <1345817851-8700-3-git-send-email-mohammed@qca.qualcomm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1345817851-8700-1-git-send-email-mohammed@qca.qualcomm.com> References: <1345817851-8700-1-git-send-email-mohammed@qca.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [172.30.48.1] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Mohammed Shafi Shajakhan Before disabling BTCOEX in the h/w cancel all BTCOEX related works. This is similar to the commit in ath9k(c32cdbd8) ath9k: Stop the BTCOEX timers before disabling BTCOEX Signed-off-by: Mohammed Shafi Shajakhan --- drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c index fe4836b..8fd64a6 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c @@ -173,9 +173,9 @@ void ath9k_htc_stop_btcoex(struct ath9k_htc_priv *priv) if (ah->btcoex_hw.enabled && ath9k_hw_get_btcoex_scheme(ah) != ATH_BTCOEX_CFG_NONE) { - ath9k_hw_btcoex_disable(ah); if (ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE) ath_htc_cancel_btcoex_work(priv); + ath9k_hw_btcoex_disable(ah); } }