summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-03-12 23:18:50 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-03-16 23:01:58 +0100
commit5ec905a8df3fa877566ba98298433fbfb3d688cc (patch)
tree9d7c6a4b4fd6a84f19c4b6f9c1571738b0da657b
parentath9k: implement IO serialization (diff)
downloadlinux-5ec905a8df3fa877566ba98298433fbfb3d688cc.tar.xz
linux-5ec905a8df3fa877566ba98298433fbfb3d688cc.zip
ath9k: AR9280 PCI devices must serialize IO as well
Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath9k/hw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 5c870436fc5f..c38a00bbce64 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -687,7 +687,8 @@ static struct ath_hal *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
}
if (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) {
- if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) {
+ if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI ||
+ (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) {
ah->ah_config.serialize_regmode =
SER_REG_MODE_ON;
} else {