diff options
| author | David S. Miller | 2009-12-03 07:00:34 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-12-03 07:00:34 +0100 |
| commit | e00484023ebe94dce03fdd1270edf3e191c2bc79 (patch) | |
| tree | 6089a0237822b46ec908be7e7cb3bea2dd426b73 /drivers/net/bnx2.c | |
| parent | cnic: Use dma_alloc_coherent(). (diff) | |
| parent | ip: update the description of rp_filter in ip-sysctl.txt (diff) | |
| download | kernel-qcow2-linux-e00484023ebe94dce03fdd1270edf3e191c2bc79.tar.gz kernel-qcow2-linux-e00484023ebe94dce03fdd1270edf3e191c2bc79.tar.xz kernel-qcow2-linux-e00484023ebe94dce03fdd1270edf3e191c2bc79.zip | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index f47bf50602d9..4cae2a86e741 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); |