Created
April 3, 2013 06:27
-
-
Save victoredwardocallaghan/5298887 to your computer and use it in GitHub Desktop.
In regards to, https://bugs.archlinux.org/task/34569
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c | |
index 76da544..70ef7e4 100644 | |
--- a/drivers/net/wireless/ath/ath9k/hw.c | |
+++ b/drivers/net/wireless/ath/ath9k/hw.c | |
@@ -779,7 +779,7 @@ u32 ar9003_get_pll_sqsum_dvc(struct ath_hw *ah) | |
if (WARN_ON_ONCE(i >= 100)) { | |
ath_err(common, "PLL4 measurement not done\n"); | |
- break; | |
+ return; | |
} | |
i++; | |
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c | |
index ade3afb..92fae7d 100644 | |
--- a/drivers/net/wireless/ath/ath9k/link.c | |
+++ b/drivers/net/wireless/ath/ath9k/link.c | |
@@ -132,6 +132,8 @@ void ath_hw_pll_work(struct work_struct *work) | |
u32 pll_sqsum; | |
struct ath_softc *sc = container_of(work, struct ath_softc, | |
hw_pll_work.work); | |
+ | |
+ ath9k_ps_wakeup(sc); | |
/* | |
* ensure that the PLL WAR is executed only | |
* after the STA is associated (or) if the | |
@@ -141,7 +143,6 @@ void ath_hw_pll_work(struct work_struct *work) | |
if (!test_bit(SC_OP_BEACONS, &sc->sc_flags)) | |
return; | |
- ath9k_ps_wakeup(sc); | |
pll_sqsum = ar9003_get_pll_sqsum_dvc(sc->sc_ah); | |
ath9k_ps_restore(sc); | |
if (ath_hw_pll_rx_hang_check(sc, pll_sqsum)) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment