diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-12-07 17:02:47 +0000 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-12-07 17:02:47 +0000 |
commit | 7730cba2a50332c194f50a58b86359ea39a82bd1 (patch) | |
tree | 64c8d7228da1454c02288068e57a9c61f8b0acd0 /drivers/net/wireless/ath/ath9k | |
parent | c20151dff8a6d503c0d0cc4387c33a618cdabcb7 (diff) | |
parent | b69f0859dc8e633c5d8c06845811588fe17e68b3 (diff) | |
download | talos-op-linux-7730cba2a50332c194f50a58b86359ea39a82bd1.tar.gz talos-op-linux-7730cba2a50332c194f50a58b86359ea39a82bd1.zip |
Merge tag 'v3.7-rc8' into spi/next
Linux 3.7-rc8
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 8e1559aba495..1829b445d0b0 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1456,7 +1456,7 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type) switch (type) { case ATH9K_RESET_POWER_ON: ret = ath9k_hw_set_reset_power_on(ah); - if (!ret) + if (ret) ah->reset_power_on = true; break; case ATH9K_RESET_WARM: |