summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath5k/reset.c
diff options
context:
space:
mode:
authorNick Kossifidis2009-02-09 05:08:51 +0100
committerJohn W. Linville2009-02-13 19:44:47 +0100
commita406c139091902acebafb2462b64ba498901e820 (patch)
treec3db1c89dc6019026fe66f9d21d608aa1052cf37 /drivers/net/wireless/ath5k/reset.c
parentath5k: Update RF Buffer handling (diff)
downloadkernel-qcow2-linux-a406c139091902acebafb2462b64ba498901e820.tar.gz
kernel-qcow2-linux-a406c139091902acebafb2462b64ba498901e820.tar.xz
kernel-qcow2-linux-a406c139091902acebafb2462b64ba498901e820.zip
ath5k: Update initvals
* Update initvals to match legacy and Sam's HAL Signed-off-by: Nick Kossifidis <mickflemm@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath5k/reset.c')
-rw-r--r--drivers/net/wireless/ath5k/reset.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c
index 40cf4c7b63b2..579c64ce6108 100644
--- a/drivers/net/wireless/ath5k/reset.c
+++ b/drivers/net/wireless/ath5k/reset.c
@@ -457,15 +457,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
* 5210 only comes with RF5110
*/
if (ah->ah_version != AR5K_AR5210) {
- if (ah->ah_radio != AR5K_RF5111 &&
- ah->ah_radio != AR5K_RF5112 &&
- ah->ah_radio != AR5K_RF5413 &&
- ah->ah_radio != AR5K_RF2413 &&
- ah->ah_radio != AR5K_RF2425) {
- ATH5K_ERR(ah->ah_sc,
- "invalid phy radio: %u\n", ah->ah_radio);
- return -EINVAL;
- }
switch (channel->hw_value & CHANNEL_MODES) {
case CHANNEL_A:
@@ -510,11 +501,11 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
return -EINVAL;
}
- /* PHY access enable */
- ath5k_hw_reg_write(ah, AR5K_PHY_SHIFT_5GHZ, AR5K_PHY(0));
-
}
+ /* PHY access enable */
+ ath5k_hw_reg_write(ah, AR5K_PHY_SHIFT_5GHZ, AR5K_PHY(0));
+
ret = ath5k_hw_write_initvals(ah, mode, change_channel);
if (ret)
return ret;