From d621436a8f6f78b91aee47b95f4f7eb19bbca2ad Mon Sep 17 00:00:00 2001 From: Mohammed Shafi Shajakhan Date: Fri, 29 Jun 2012 10:34:39 +0530 Subject: [PATCH] --- yaml --- r: 315234 b: refs/heads/master c: c11216d1f62163e7de92793dcfd4d06247d0a20e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/gpio.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5878dca65337..298cfd74d291 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2152fe9c2fa4c948347b83cb0649d24d214267f5 +refs/heads/master: c11216d1f62163e7de92793dcfd4d06247d0a20e diff --git a/trunk/drivers/net/wireless/ath/ath9k/gpio.c b/trunk/drivers/net/wireless/ath/ath9k/gpio.c index 9ae6a4d97691..5eac4d168653 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/gpio.c +++ b/trunk/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); }