diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2017-03-23 20:47:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-24 13:43:11 -0700 |
| commit | 9f47a48e6eb97d793db85373e3ef4c55d876d334 (patch) | |
| tree | bfeccc670e775a3629b632a681f4751bf5cdef64 /drivers/net/ethernet/intel/e1000e | |
| parent | a80db69e47d764bbcaf2fec54b1f308925e7c490 (diff) | |
| download | linux-9f47a48e6eb97d793db85373e3ef4c55d876d334.tar.bz2 | |
Revert "e1000e: driver trying to free already-free irq"
This reverts commit 7e54d9d063fa239c95c21548c5267f0ef419ff56.
After additional regression testing, several users are experiencing
kernel panics during shutdown on e1000e devices. Reverting this
change resolves the issue.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 2175cced402f..e9af89ad039c 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -6274,8 +6274,8 @@ static int e1000e_pm_freeze(struct device *dev) /* Quiesce the device without resetting the hardware */ e1000e_down(adapter, false); e1000_free_irq(adapter); - e1000e_reset_interrupt_capability(adapter); } + e1000e_reset_interrupt_capability(adapter); /* Allow time for pending master requests to run */ e1000e_disable_pcie_master(&adapter->hw); |