aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-02 22:00:34 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-02 22:00:34 -0800
commite00484023ebe94dce03fdd1270edf3e191c2bc79 (patch)
tree6089a0237822b46ec908be7e7cb3bea2dd426b73 /drivers/net/bnx2.c
parent3248e1682035eef6774c280cd7be19984feb78bb (diff)
parent1f5865e73fb18834f52bd6e1d27bce86ff372089 (diff)
downloadkernel_samsung_smdk4412-e00484023ebe94dce03fdd1270edf3e191c2bc79.zip
kernel_samsung_smdk4412-e00484023ebe94dce03fdd1270edf3e191c2bc79.tar.gz
kernel_samsung_smdk4412-e00484023ebe94dce03fdd1270edf3e191c2bc79.tar.bz2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/bnx2.c')
-rw-r--r--drivers/net/bnx2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index f47bf50..4cae2a8 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -8316,6 +8316,7 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)
}
pci_set_master(pdev);
pci_restore_state(pdev);
+ pci_save_state(pdev);
if (netif_running(dev)) {
bnx2_set_power_state(bp, PCI_D0);