Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 200860
b: refs/heads/master
c: fa37813
h: refs/heads/master
v: v3
  • Loading branch information
Andy Gospodarek authored and David S. Miller committed Jun 30, 2010
1 parent d6c7937 commit f705b58
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bf988435bd5b53529f4408a8efb1f433f6ddfda9
refs/heads/master: fa37813401ff52d78591c262d6542e4d5d935584
3 changes: 2 additions & 1 deletion trunk/drivers/net/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5195,7 +5195,6 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)
ixgbe_free_all_tx_resources(adapter);
ixgbe_free_all_rx_resources(adapter);
}
ixgbe_clear_interrupt_scheme(adapter);

#ifdef CONFIG_PM
retval = pci_save_state(pdev);
Expand Down Expand Up @@ -5230,6 +5229,8 @@ static int __ixgbe_shutdown(struct pci_dev *pdev, bool *enable_wake)

*enable_wake = !!wufc;

ixgbe_clear_interrupt_scheme(adapter);

ixgbe_release_hw_control(adapter);

pci_disable_device(pdev);
Expand Down

0 comments on commit f705b58

Please sign in to comment.