Return-path: Received: from ogre.sisk.pl ([217.79.144.158]:57955 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753786Ab1KZWez (ORCPT ); Sat, 26 Nov 2011 17:34:55 -0500 From: "Rafael J. Wysocki" To: Senthil Balasubramanian , "Luis R. Rodriguez" Subject: [PATCH] ath9k: Revert change that broke AR928X on Acer Ferrari One Date: Sat, 26 Nov 2011 23:37:43 +0100 Cc: "John W. Linville" , Linus Torvalds , Linux Kernel Mailing List , Linux Wireless , Adrian Chadd References: <201111250203.29786.rjw@sisk.pl> <201111262232.46195.rjw@sisk.pl> In-Reply-To: <201111262232.46195.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Message-Id: <201111262337.43771.rjw@sisk.pl> (sfid-20111126_233536_508471_4773E334) Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Rafael J. Wysocki Revert a hunk in drivers/net/wireless/ath/ath9k/hw.c introduced by commit 2577c6e8f2320f1d2f09be122efef5b9118efee4 (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 --- drivers/net/wireless/ath/ath9k/hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: linux/drivers/net/wireless/ath/ath9k/hw.c =================================================================== --- linux.orig/drivers/net/wireless/ath/ath9k/hw.c +++ linux/drivers/net/wireless/ath/ath9k/hw.c @@ -1827,7 +1827,8 @@ static void ath9k_set_power_sleep(struct } /* 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); } /*