ath9k: Revert change that broke AR928X on Acer Ferrari One
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 26 Nov 2011 22:37:43 +0000 (23:37 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Nov 2011 19:47:34 +0000 (11:47 -0800)
Revert a hunk in drivers/net/wireless/ath/ath9k/hw.c introduced by
commit 2577c6e8f232 ("ath9k_hw: Add support for AR946/8x chipsets") that
caused a nasty regression to appear on my Acer Ferrari One (the box
locks up entirely at random times after the wireless has been started
without any way to get debug information out of it).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/net/wireless/ath/ath9k/hw.c

index 2f91acccb7dbc80499e7988b74ac62521bd06799..8873c6e6fb9627c02c41d4b1d36ffb340da3eacf 100644 (file)
@@ -1827,7 +1827,8 @@ static void ath9k_set_power_sleep(struct ath_hw *ah, int setChip)
        }
 
        /* Clear Bit 14 of AR_WA after putting chip into Full Sleep mode. */
-       REG_WRITE(ah, AR_WA, ah->WARegVal & ~AR_WA_D3_L1_DISABLE);
+       if (AR_SREV_9300_20_OR_LATER(ah))
+               REG_WRITE(ah, AR_WA, ah->WARegVal & ~AR_WA_D3_L1_DISABLE);
 }
 
 /*