git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-agn.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-agn.c
b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b35c8813bef43fe9173d8a5b88bf8d69241a29d1..c01ea48da5fe5b7b949407b57745f5843fb3276e 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-agn.c
@@
-4042,6
+4042,7
@@
static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)
priv->is_open = 1;
}
+ pci_save_state(pdev);
pci_set_power_state(pdev, PCI_D3hot);
return 0;
@@
-4052,6
+4053,7
@@
static int iwl_pci_resume(struct pci_dev *pdev)
struct iwl_priv *priv = pci_get_drvdata(pdev);
pci_set_power_state(pdev, PCI_D0);
+ pci_restore_state(pdev);
if (priv->is_open)
iwl_mac_start(priv->hw);