diff options
| author | Jouni Malinen <jouni.malinen@atheros.com> | 2009-06-16 11:59:23 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-02 16:50:28 -0700 |
| commit | 42848904e9e78a3aae7c03b1539268ef82114017 (patch) | |
| tree | b8184fbe0b4578571c6b94e260ddde4d0b763cae /drivers/net | |
| parent | 5bbc754a8a4857eb09ebcfc5afe9fb6b59b75291 (diff) | |
ath5k: avoid PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling
commit 8451d22dad40a66416b8d9c0952efa09ec5398c5 upstream.
This reverts 'ath5k: remove dummy PCI "retry timeout" fix' on the
same theory as in 'ath9k: Fix PCI FATAL interrupts by restoring
RETRY_TIMEOUT disabling'.
Reported-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath5k/base.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index 32df27a9c7a..409f022992b 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c @@ -685,6 +685,13 @@ ath5k_pci_resume(struct pci_dev *pdev) if (err) return err; + /* + * Suspend/Resume resets the PCI configuration space, so we have to + * re-disable the RETRY_TIMEOUT register (0x41) to keep + * PCI Tx retries from interfering with C3 CPU state + */ + pci_write_config_byte(pdev, 0x41, 0); + err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc); if (err) { ATH5K_ERR(sc, "request_irq failed\n"); |