Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[mv-sheeva.git] / drivers / net / wireless / ath / ath9k / hw.c

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index d582cf73098fec9b06595babeaa2036c3ad6992b..2eb0ef315e315386d499ba702555be6bbdd32e55 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1568,7 +1568,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
                allow_fbs = true;
 
        if (bChannelChange &&
-           (ah->chip_fullsleep != true) &&
+           (!ah->chip_fullsleep) &&
            (ah->curchan != NULL) &&
            (chan->channel != ah->curchan->channel) &&
            (allow_fbs ||
@@ -1936,8 +1936,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
        if (setChip) {
                if ((REG_READ(ah, AR_RTC_STATUS) &
                     AR_RTC_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) {
-                       if (ath9k_hw_set_reset_reg(ah,
-                                          ATH9K_RESET_POWER_ON) != true) {
+                       if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
                                return false;
                        }
                        if (!AR_SREV_9300_20_OR_LATER(ah))