diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-12 12:00:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-12 12:00:41 +1100 |
| commit | cb20f70ad3aa168a97455b15b8888cc6e2416559 (patch) | |
| tree | 50787e9abc0dfadbdd6e8e60c0c838aea0601414 /drivers/net/myri10ge | |
| parent | f8937ac7622d241a1a15b3b32a7ffe52b5ef5f1d (diff) | |
| parent | fe31e69740eddc7316071ed5165fed6703c8cd12 (diff) | |
Merge commit 'refs/next/20110107/pci'
Conflicts:
drivers/net/skge.c
drivers/net/sky2.c
Diffstat (limited to 'drivers/net/myri10ge')
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index a37fcf11ab36..ea5cfe2c3a04 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -3403,9 +3403,7 @@ static int myri10ge_resume(struct pci_dev *pdev) return -EIO; } - status = pci_restore_state(pdev); - if (status) - return status; + pci_restore_state(pdev); status = pci_enable_device(pdev); if (status) { |