]> Pileus Git - ~andy/linux/commitdiff
ath9k: avoid accessing MRC registers on single-chain devices
authorFelix Fietkau <nbd@openwrt.org>
Tue, 13 Aug 2013 10:33:28 +0000 (12:33 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Aug 2013 20:07:58 +0000 (16:07 -0400)
They are not implemented, and accessing them might trigger errors

Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/ar9003_phy.c

index 39c37309f39e5ddc656f8dc78438b19c15128634..18a5aa4fe406670fe435f6aeefe4a9aab150b26d 100644 (file)
@@ -1172,6 +1172,10 @@ skip_ws_det:
                 * is_on == 0 means MRC CCK is OFF (more noise imm)
                 */
                bool is_on = param ? 1 : 0;
+
+               if (ah->caps.rx_chainmask == 1)
+                       break;
+
                REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
                              AR_PHY_MRC_CCK_ENABLE, is_on);
                REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,