2012-06-28 12:19:23

by Mohammed Shafi Shajakhan

Subject: [RFC] ath9k: Fix clearing of BTCOEX flags

From: Mohammed Shafi Shajakhan <[email protected]>

BTCOEX flags are set/cleared by atomic operations.
We got to do the same in ath9k_btcoex_timer_resume,
while clearing those BTCOEX flags.

Cc: Sujith Manoharan <[email protected]>
Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>
---
drivers/net/wireless/ath/ath9k/gpio.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 26032cb..bd342cd 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -305,7 +305,8 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)

btcoex->bt_priority_cnt = 0;
btcoex->bt_priority_time = jiffies;
- btcoex->op_flags &= ~(BT_OP_PRIORITY_DETECTED | BT_OP_SCAN);
+ clear_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags);
+ clear_bit(BT_OP_SCAN, &btcoex->op_flags);

mod_timer(&btcoex->period_timer, jiffies);
}
--
1.7.0.4

2012-06-29 01:15:57

by Sujith Manoharan

Subject: [RFC] ath9k: Fix clearing of BTCOEX flags

Mohammed Shafi Shajakhan wrote:
> From: Mohammed Shafi Shajakhan <[email protected]>
>
> BTCOEX flags are set/cleared by atomic operations.
> We got to do the same in ath9k_btcoex_timer_resume,
> while clearing those BTCOEX flags.
>
> Cc: Sujith Manoharan <[email protected]>
> Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>
> ---
> drivers/net/wireless/ath/ath9k/gpio.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
> index 26032cb..bd342cd 100644
> --- a/drivers/net/wireless/ath/ath9k/gpio.c
> +++ b/drivers/net/wireless/ath/ath9k/gpio.c
> @@ -305,7 +305,8 @@ void ath9k_btcoex_timer_resume(struct ath_softc *sc)
>
> btcoex->bt_priority_cnt = 0;
> btcoex->bt_priority_time = jiffies;
> - btcoex->op_flags &= ~(BT_OP_PRIORITY_DETECTED | BT_OP_SCAN);
> + clear_bit(BT_OP_PRIORITY_DETECTED, &btcoex->op_flags);
> + clear_bit(BT_OP_SCAN, &btcoex->op_flags);

Rebase damage.

Acked-by: Sujith Manoharan <[email protected]>