2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 7373e4b92c92..2bb89b1a733b 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -473,7 +473,7 @@ struct ath_btcoex {
         unsigned long op_flags;
         int bt_stomp_type; /* Types of BT stomping */
         u32 btcoex_no_stomp; /* in usec */
-        u32 btcoex_period; /* in usec */
+        u32 btcoex_period; /* in msec */
         u32 btscan_no_stomp; /* in usec */
         u32 duty_cycle;
         u32 bt_wait_time;
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 9f83f71742a5..5046ca4e30a8 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -228,7 +228,12 @@ static void ath_btcoex_period_timer(unsigned long data)
         ath9k_hw_btcoex_enable(ah);
         spin_unlock_bh(&btcoex->btcoex_lock);
 
-        if (btcoex->btcoex_period != btcoex->btcoex_no_stomp) {
+        /*
+         * btcoex_period is in msec while (btocex/btscan_)no_stomp are in usec,
+         * ensure that we properly convert btcoex_period to usec
+         * for any comparision with (btcoex/btscan_)no_stomp.
+         */
+        if (btcoex->btcoex_period * 1000 != btcoex->btcoex_no_stomp) {
                 if (btcoex->hw_timer_enabled)
                         ath9k_gen_timer_stop(ah, btcoex->no_stomp_timer);