From patchwork Mon Aug 10 00:30:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Kossifidis X-Patchwork-Id: 40324 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7A0Ucvw010907 for ; Mon, 10 Aug 2009 00:30:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754126AbZHJAae (ORCPT ); Sun, 9 Aug 2009 20:30:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754153AbZHJAae (ORCPT ); Sun, 9 Aug 2009 20:30:34 -0400 Received: from venema.h4ckr.net ([217.24.1.135]:34206 "EHLO venema.h4ckr.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753059AbZHJAae (ORCPT ); Sun, 9 Aug 2009 20:30:34 -0400 Received: from localhost (localhost [127.0.0.1]) by venema.h4ckr.net (Postfix) with ESMTP id DE95A2DE2C7; Mon, 10 Aug 2009 02:30:34 +0200 (CEST) Received: from venema.h4ckr.net ([127.0.0.1]) by localhost (venema.h4ckr.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pxKBiqkZlNKg; Mon, 10 Aug 2009 02:30:34 +0200 (CEST) Received: from localhost (athedsl-4504251.home.otenet.gr [94.71.166.195]) by venema.h4ckr.net (Postfix) with ESMTP id 55EB22DE2C5; Mon, 10 Aug 2009 02:30:34 +0200 (CEST) Date: Mon, 10 Aug 2009 03:30:32 +0300 From: Nick Kossifidis To: ath5k-devel@venema.h4ckr.net, linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com, jirislaby@gmail.com, me@bobcopeland.com, mcgrof@gmail.com, nbd@openwrt.org Subject: [PATCH 4/5] ath5k: Preserve pcicfg bits during attach Message-ID: <20090810003032.GD7079@makis> Mail-Followup-To: ath5k-devel@lists.ath5k.org, linux-wireless@vger.kernel.org, linville@tuxdriver.com, jirislaby@gmail.com, me@bobcopeland.com, mcgrof@gmail.com, nbd@openwrt.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org * During attach preserve pcicfg bits when enabling pci core sw retry fix. Signed-off-by: Nick Kossifidis --- drivers/net/wireless/ath/ath5k/attach.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c index 238eeb7..65d438b 100644 --- a/drivers/net/wireless/ath/ath5k/attach.c +++ b/drivers/net/wireless/ath/ath5k/attach.c @@ -261,7 +261,7 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version) /* Enable pci core retry fix on Hainan (5213A) and later chips */ if (srev >= AR5K_SREV_AR5213A) - ath5k_hw_reg_write(ah, AR5K_PCICFG_RETRY_FIX, AR5K_PCICFG); + AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, AR5K_PCICFG_RETRY_FIX); /* * Get card capabilities, calibration values etc