diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 17:13:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 17:13:01 +0100 |
| commit | 4f58605e6b7ae30a0d048af6a868582768e6754c (patch) | |
| tree | 2b72e81761c7874b48825267958e58823e05b592 /drivers/net/wireless/ath/ath9k/hw.c | |
| parent | ixgbe: fix possible NULL pointer deference in shutdown path (diff) | |
| parent | Revert "ath9k: Fix STA disconnect issue due to received MIC failed bcast frames" (diff) | |
| download | linux-4f58605e6b7ae30a0d048af6a868582768e6754c.tar.xz linux-4f58605e6b7ae30a0d048af6a868582768e6754c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 6ebc68bca91f..c7fbe25cc128 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -2044,7 +2044,8 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio) val = REG_READ(ah, AR7010_GPIO_IN); return (MS(val, AR7010_GPIO_IN_VAL) & AR_GPIO_BIT(gpio)) == 0; } else if (AR_SREV_9300_20_OR_LATER(ah)) - return MS_REG_READ(AR9300, gpio) != 0; + return (MS(REG_READ(ah, AR_GPIO_IN), AR9300_GPIO_IN_VAL) & + AR_GPIO_BIT(gpio)) != 0; else if (AR_SREV_9271(ah)) return MS_REG_READ(AR9271, gpio) != 0; else if (AR_SREV_9287_11_OR_LATER(ah)) |