aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-pci.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 0b815de9254..fb7e436b40c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -508,6 +508,11 @@ static int iwl_pci_suspend(struct device *device)
508 struct pci_dev *pdev = to_pci_dev(device); 508 struct pci_dev *pdev = to_pci_dev(device);
509 struct iwl_bus *bus = pci_get_drvdata(pdev); 509 struct iwl_bus *bus = pci_get_drvdata(pdev);
510 510
511 /* Before you put code here, think about WoWLAN. You cannot check here
512 * whether WoWLAN is enabled or not, and your code will run even if
513 * WoWLAN is enabled - don't kill the NIC, someone may need it in Sx.
514 */
515
511 return iwl_suspend(bus->drv_data); 516 return iwl_suspend(bus->drv_data);
512} 517}
513 518
@@ -516,6 +521,11 @@ static int iwl_pci_resume(struct device *device)
516 struct pci_dev *pdev = to_pci_dev(device); 521 struct pci_dev *pdev = to_pci_dev(device);
517 struct iwl_bus *bus = pci_get_drvdata(pdev); 522 struct iwl_bus *bus = pci_get_drvdata(pdev);
518 523
524 /* Before you put code here, think about WoWLAN. You cannot check here
525 * whether WoWLAN is enabled or not, and your code will run even if
526 * WoWLAN is enabled - the NIC may be alive.
527 */
528
519 /* 529 /*
520 * We disable the RETRY_TIMEOUT register (0x41) to keep 530 * We disable the RETRY_TIMEOUT register (0x41) to keep
521 * PCI Tx retries from interfering with C3 CPU state. 531 * PCI Tx retries from interfering with C3 CPU state.