2015-06-21 17:47:48

by Felix Fietkau

Subject: [PATCH] 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 <[email protected]>
---
drivers/net/wireless/ath/ath9k/hw.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 5e15e8e..a31a680 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;
--
2.2.2

2015-07-11 16:59:43

by Kalle Valo

Subject: Re: 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 <[email protected]>

Thanks, applied to wireless-drivers.git.

Kalle Valo