From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763239AbZD3RnL (ORCPT ); Thu, 30 Apr 2009 13:43:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764678AbZD3RIm (ORCPT ); Thu, 30 Apr 2009 13:08:42 -0400 Received: from kroah.org ([198.145.64.141]:56914 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764616AbZD3RIY (ORCPT ); Thu, 30 Apr 2009 13:08:24 -0400 X-Mailbox-Line: From gregkh@mini.kroah.org Thu Apr 30 09:57:49 2009 Message-Id: <20090430165749.719640973@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Thu, 30 Apr 2009 09:57:06 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, "Luis R. Rodriguez" , ath9k-devel@venema.h4ckr.net, linux-wireless@vger.kernel.org Subject: [patch 77/88] ath9k: AR9280 PCI devices must serialize IO as well References: <20090430165549.117010404@mini.kroah.org> Content-Disposition: inline; filename=ath9k-ar9280-pci-devices-must-serialize-io-as-well.patch In-Reply-To: <20090430170122.GA16015@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.28-stable review patch. If anyone has any objections, please let us know. ------------------ From: Luis R. Rodriguez This is a port of: commit SHA1 5ec905a8df3fa877566ba98298433fbfb3d688cc for 2.6.28 Signed-off-by: Luis R. Rodriguez --- drivers/net/wireless/ath9k/hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c @@ -3311,7 +3311,8 @@ static struct ath_hal *ath9k_hw_do_attac } if (ah->ah_config.serialize_regmode == SER_REG_MODE_AUTO) { - if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI) { + if (ah->ah_macVersion == AR_SREV_VERSION_5416_PCI || + (AR_SREV_9280(ah) && !ah->ah_isPciExpress)) { ah->ah_config.serialize_regmode = SER_REG_MODE_ON; } else {