aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-06-21 19:47:46 +0200
committerKalle Valo <kvalo@codeaurora.org>2015-07-11 19:58:56 +0300
commit7865598ec24ab4162d976d0bd75a9b2a2f58cd64 (patch)
tree3a1ef1665d0e43b44c49b943703cb3378540d2fc /drivers/net/wireless
parentDoc: z8530book: Fix typo in API-z8530-sync-txdma-open.html (diff)
downloadlinux-dev-7865598ec24ab4162d976d0bd75a9b2a2f58cd64.tar.xz
linux-dev-7865598ec24ab4162d976d0bd75a9b2a2f58cd64.zip
ath9k_hw: fix device ID check for AR956x
Because of the missing return, the macVersion value was being overwritten with an invalid register read Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 5e15e8e10ed3..a31a6804dc34 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -279,6 +279,7 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
return;
case AR9300_DEVID_QCA956X:
ah->hw_version.macVersion = AR_SREV_VERSION_9561;
+ return;
}
val = REG_READ(ah, AR_SREV) & AR_SREV_ID;