aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorAbhijeet Kolekar <abhijeet.kolekar@intel.com>2010-04-14 13:27:00 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-04-30 18:34:30 -0400
commitcd398c313785cb5f2b8cb2c85e865f06419b1730 (patch)
treec00c3a6db44d8e5cecb984a2529e1f6381979ee1 /drivers/net/wireless
parentf001b300493287a19ebd88fbca56978dabfec55a (diff)
iwlwifi: reset pci retry timeout
We removed resetting of PCI_RETRY_TIMEOUT register in merge of suspend resume work. 'Suspend and resume' resets the PCI configuration space, so we have to disable the RETRY_TIMEOUT register again here. Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 1cbc22a180a7..1e11706dcf63 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2930,6 +2930,12 @@ int iwl_pci_resume(struct pci_dev *pdev)
2930 struct iwl_priv *priv = pci_get_drvdata(pdev); 2930 struct iwl_priv *priv = pci_get_drvdata(pdev);
2931 int ret; 2931 int ret;
2932 2932
2933 /*
2934 * We disable the RETRY_TIMEOUT register (0x41) to keep
2935 * PCI Tx retries from interfering with C3 CPU state.
2936 */
2937 pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
2938
2933 pci_set_power_state(pdev, PCI_D0); 2939 pci_set_power_state(pdev, PCI_D0);
2934 ret = pci_enable_device(pdev); 2940 ret = pci_enable_device(pdev);
2935 if (ret) 2941 if (ret)