Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 315234
b: refs/heads/master
c: c11216d
h: refs/heads/master
v: v3
  • Loading branch information
Mohammed Shafi Shajakhan authored and John W. Linville committed Jul 9, 2012
1 parent cbd2e73 commit d621436
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2152fe9c2fa4c948347b83cb0649d24d214267f5
refs/heads/master: c11216d1f62163e7de92793dcfd4d06247d0a20e
3 changes: 2 additions & 1 deletion trunk/drivers/net/wireless/ath/ath9k/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit d621436

Please sign in to comment.