diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 01:00:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 01:00:34 -0500 |
| commit | e00484023ebe94dce03fdd1270edf3e191c2bc79 (patch) | |
| tree | 6089a0237822b46ec908be7e7cb3bea2dd426b73 /drivers/net/bnx2.c | |
| parent | 3248e1682035eef6774c280cd7be19984feb78bb (diff) | |
| parent | 1f5865e73fb18834f52bd6e1d27bce86ff372089 (diff) | |
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) | |||
| 8316 | } | 8316 | } |
| 8317 | pci_set_master(pdev); | 8317 | pci_set_master(pdev); |
| 8318 | pci_restore_state(pdev); | 8318 | pci_restore_state(pdev); |
| 8319 | pci_save_state(pdev); | ||
| 8319 | 8320 | ||
| 8320 | if (netif_running(dev)) { | 8321 | if (netif_running(dev)) { |
| 8321 | bnx2_set_power_state(bp, PCI_D0); | 8322 | bnx2_set_power_state(bp, PCI_D0); |