From be7b80f2c277e8481690c481273b51b253b6fb66 Mon Sep 17 00:00:00 2001 From: Mohammed Shafi Shajakhan Date: Tue, 28 Aug 2012 12:14:48 +0530 Subject: [PATCH] --- yaml --- r: 322777 b: refs/heads/master c: 5d9b6f263995d7f43202d76cf2e23d43f9240a90 h: refs/heads/master i: 322775: a8281c561749fdb845ba13fae1bd7402e625f24b 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 3e8d9b26885c..23821ce6e3bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3ccc1a56280119fe1fbf9929a76b4034358bfef +refs/heads/master: 5d9b6f263995d7f43202d76cf2e23d43f9240a90 diff --git a/trunk/drivers/net/wireless/ath/ath9k/gpio.c b/trunk/drivers/net/wireless/ath/ath9k/gpio.c index bacdb8fb4ef4..9f83f71742a5 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/gpio.c +++ b/trunk/drivers/net/wireless/ath/ath9k/gpio.c @@ -341,7 +341,8 @@ void ath9k_btcoex_stop_gen_timer(struct ath_softc *sc) { struct ath_btcoex *btcoex = &sc->btcoex; - ath9k_gen_timer_stop(sc->sc_ah, btcoex->no_stomp_timer); + if (btcoex->hw_timer_enabled) + ath9k_gen_timer_stop(sc->sc_ah, btcoex->no_stomp_timer); } u16 ath9k_btcoex_aggr_limit(struct ath_softc *sc, u32 max_4ms_framelen)