diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-02-16 02:53:20 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-27 14:52:37 -0500 |
commit | 0caa7b14f36e8c3c43dd9294a960ae55cafe07fb (patch) | |
tree | 13a878857346d4bb67e57b31f6ab25a03ed4c6d7 /drivers/net/wireless/ath9k/pci.c | |
parent | 70768496db9ee27d53d3d03d50c93fbf4c0198a0 (diff) |
ath9k: Fix HW wait timeout
RX and calibration have different timeout requirements.
This patch fixes it by changing the HW wait routine
to accept a timeout value.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/pci.c')
-rw-r--r-- | drivers/net/wireless/ath9k/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath9k/pci.c b/drivers/net/wireless/ath9k/pci.c index c28afe42b269..a70f954c9e75 100644 --- a/drivers/net/wireless/ath9k/pci.c +++ b/drivers/net/wireless/ath9k/pci.c | |||
@@ -63,7 +63,8 @@ static bool ath_pci_eeprom_read(struct ath_hw *ah, u32 off, u16 *data) | |||
63 | if (!ath9k_hw_wait(ah, | 63 | if (!ath9k_hw_wait(ah, |
64 | AR_EEPROM_STATUS_DATA, | 64 | AR_EEPROM_STATUS_DATA, |
65 | AR_EEPROM_STATUS_DATA_BUSY | | 65 | AR_EEPROM_STATUS_DATA_BUSY | |
66 | AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0)) { | 66 | AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0, |
67 | AH_WAIT_TIMEOUT)) { | ||
67 | return false; | 68 | return false; |
68 | } | 69 | } |
69 | 70 | ||