git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
ar9002_calib.c
diff --git
a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
index
ea2e7d7
..
5e300bd
100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/
drivers/net/wireless/ath/ath9k/ar9002_calib.c
@@
-679,10
+679,6
@@
static bool ar9002_hw_calibrate(struct ath_hw *ah,
/* Do NF cal only at longer intervals */
if (longcal || nfcal_pending) {
/* Do NF cal only at longer intervals */
if (longcal || nfcal_pending) {
- /* Do periodic PAOffset Cal */
- ar9002_hw_pa_cal(ah, false);
- ar9002_hw_olc_temp_compensation(ah);
-
/*
* Get the value from the previous NF cal and update
* history buffer.
/*
* Get the value from the previous NF cal and update
* history buffer.
@@
-697,8
+693,12
@@
static bool ar9002_hw_calibrate(struct ath_hw *ah,
ath9k_hw_loadnf(ah, ah->curchan);
}
ath9k_hw_loadnf(ah, ah->curchan);
}
- if (longcal)
+ if (longcal)
{
ath9k_hw_start_nfcal(ah, false);
ath9k_hw_start_nfcal(ah, false);
+ /* Do periodic PAOffset Cal */
+ ar9002_hw_pa_cal(ah, false);
+ ar9002_hw_olc_temp_compensation(ah);
+ }
}
return iscaldone;
}
return iscaldone;